# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1151696128 -7200
# Node ID 7a90e0c77f43f9f34232bd0c1493b9b90803a83f
# Parent  d181845bdc5127abd9ef290a53044c0a7754a47b# Parent  c1974f65d781f35b0a6c7ad9a7a87d1a6d66e2b4
Merge with crew.

diff -r c1974f65d781 -r 7a90e0c77f43 Makefile
--- a/Makefile	Fri Jun 30 18:57:04 2006 +0200
+++ b/Makefile	Fri Jun 30 21:35:28 2006 +0200
@@ -37,12 +37,20 @@
 	rm -f MANIFEST mercurial/__version__.py mercurial/*.so tests/*.err
 	$(MAKE) -C doc clean
 
-install: all
+install: install-bin install-doc
+
+install-bin: build
 	$(PYTHON) setup.py install --prefix="$(PREFIX)" --force
+
+install-doc: doc
 	cd doc && $(MAKE) $(MFLAGS) install
 
-install-home: all
+install-home: install-home-bin install-home-doc
+
+install-home-bin: build
 	$(PYTHON) setup.py install --home="$(HOME)" --force
+
+install-home-doc: doc
 	cd doc && $(MAKE) $(MFLAGS) PREFIX="$(HOME)" install
 
 dist:	tests dist-notests
@@ -57,5 +65,5 @@
 	cd tests && $(PYTHON) run-tests.py $@
 
 
-.PHONY: help all local build doc clean install install-home dist dist-notests tests
-
+.PHONY: help all local build doc clean install install-bin install-doc \
+	install-home install-home-bin install-home-doc dist dist-notests tests
diff -r c1974f65d781 -r 7a90e0c77f43 hgext/mq.py
--- a/hgext/mq.py	Fri Jun 30 18:57:04 2006 +0200
+++ b/hgext/mq.py	Fri Jun 30 21:35:28 2006 +0200
@@ -1083,6 +1083,7 @@
     return 0
 
 def commit(ui, repo, *pats, **opts):
+    """commit changes in the queue repository"""
     q = repomap[repo]
     r = q.qrepo()
     if not r: raise util.Abort('no queue repository')
@@ -1264,7 +1265,7 @@
          'hg qimport [-e] [-n NAME] [-f] FILE...'),
     "^qinit":
         (init,
-         [('c', 'create-repo', None, 'create patch repository')],
+         [('c', 'create-repo', None, 'create queue repository')],
          'hg qinit [-c]'),
     "qnew":
         (new,
diff -r c1974f65d781 -r 7a90e0c77f43 tests/test-globalopts
--- a/tests/test-globalopts	Fri Jun 30 18:57:04 2006 +0200
+++ b/tests/test-globalopts	Fri Jun 30 21:35:28 2006 +0200
@@ -62,7 +62,7 @@
 hg --cwd a --time tip 2>&1 | grep '^Time:' | sed 's/[0-9][0-9]*/x/g'
 
 echo %% --version
-hg --version -q | sed 's/version \([a-f0-9+]*\|unknown\)/version xxx/'
+hg --version -q | sed 's/version [^)]*/version xxx/'
 
 echo %% -h/--help
 hg -h
diff -r c1974f65d781 -r 7a90e0c77f43 tests/test-hup
--- a/tests/test-hup	Fri Jun 30 18:57:04 2006 +0200
+++ b/tests/test-hup	Fri Jun 30 21:35:28 2006 +0200
@@ -7,7 +7,7 @@
 P=$!
 (echo lock; echo addchangegroup; sleep 5) > p &
 Q=$!
-sleep 1
+sleep 3
 kill -HUP $P
 wait
 ls .hg
diff -r c1974f65d781 -r 7a90e0c77f43 tests/test-pull-pull-corruption2
--- a/tests/test-pull-pull-corruption2	Fri Jun 30 18:57:04 2006 +0200
+++ b/tests/test-pull-pull-corruption2	Fri Jun 30 21:35:28 2006 +0200
@@ -20,5 +20,6 @@
 sleep 1
 
 hg clone --pull -U version2 corrupted
+wait
 hg -R corrupted verify
 hg -R version2 verify