changeset 597:16519af337fe

remove some references to tla
author tw@waldmann-edv.de
date Sun, 23 Apr 2006 00:15:38 +0200
parents 1c326229c683
children ed7033e4cafe
files Makefile MoinMoin/i18n/po2wiki.py MoinMoin/i18n/wiki2po.py
diffstat 3 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Apr 23 00:09:21 2006 +0200
+++ b/Makefile	Sun Apr 23 00:15:38 2006 +0200
@@ -67,18 +67,13 @@
 
 # Update the current tree from `tla my-default-archive`
 update:
-	tla update
+	hg pull -u
 	$(MAKE) patchlevel
 
 # Update underlay directory from the tarball
 update-underlay:
 	cd $(share); rm -rf underlay; tar xjf underlay.tar.bz2
 
-# Merge from main branch
-# Ignore error in the merge and update underlay
-merge:
-	tla star-merge arch@arch.thinkmo.de--2003-archives/moin--main--1.5
-
 test: 
 	@python tests/maketestwiki.py
 	@python tests/runtests.py
@@ -93,6 +88,6 @@
 	find . -name "*.pyc" -exec rm -rf "{}" \; 
 
 .PHONY: all dist install-docs check-tabs epydoc underlay patchlevel \
-	check-i18n update update-underlay merge test testwiki clean \
+	check-i18n update update-underlay test testwiki clean \
 	clean-testwiki clean-pyc
 
--- a/MoinMoin/i18n/po2wiki.py	Sun Apr 23 00:09:21 2006 +0200
+++ b/MoinMoin/i18n/po2wiki.py	Sun Apr 23 00:15:38 2006 +0200
@@ -8,7 +8,7 @@
     import sys, os, xmlrpclib
     sys.path.insert(0, '../..')
 
-    excluded = ["en",] # languages managed in tla repository, not in wiki
+    excluded = ["en",] # languages managed in repository, not in wiki
 
     lang = sys.argv[1]
     lang = lang.replace('_', '-') # module names use _ instead of -
--- a/MoinMoin/i18n/wiki2po.py	Sun Apr 23 00:09:21 2006 +0200
+++ b/MoinMoin/i18n/wiki2po.py	Sun Apr 23 00:15:38 2006 +0200
@@ -6,7 +6,7 @@
     import sys, xmlrpclib
     sys.path.insert(0, '../..')
 
-    excluded = ["en",] # languages managed in tla repository, not in wiki
+    excluded = ["en",] # languages managed in repository, not in wiki
 
     langfname = sys.argv[1]
     lang = langfname.replace('_', '-') # module names use _ instead of -