--- a/tests/test-treediscovery-legacy.t Mon Jul 04 14:36:16 2011 +0300
+++ b/tests/test-treediscovery-legacy.t Tue Jul 05 11:53:32 2011 +0100
@@ -17,7 +17,7 @@
$ remote=http://localhost:$HGPORT/
$ export remote
- $ start() {
+ $ tstart() {
> echo '[web]' > $1/.hg/hgrc
> echo 'push_ssl = false' >> $1/.hg/hgrc
> echo 'allow_push = *' >> $1/.hg/hgrc
@@ -25,7 +25,7 @@
> hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -E errors.log
> cat hg.pid >> $DAEMON_PIDS
> }
- $ stop() {
+ $ tstop() {
> "$TESTDIR/killdaemons.py"
> cp $HGRCPATH-withcap $HGRCPATH
> }
@@ -34,7 +34,7 @@
$ hg init empty1
$ hg init empty2
- $ start empty2
+ $ tstart empty2
$ hg incoming -R empty1 $remote
comparing with http://localhost:$HGPORT/
no changes found
@@ -49,7 +49,7 @@
$ hg push -R empty1 $remote
pushing to http://localhost:$HGPORT/
no changes found
- $ stop
+ $ tstop
Base repo:
@@ -82,7 +82,7 @@
o 0 d57206cc072a: r0
$ cd ..
- $ start main
+ $ tstart main
Full clone:
@@ -199,7 +199,7 @@
Remote is empty:
- $ stop ; start empty2
+ $ tstop ; tstart empty2
$ cd main
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -241,7 +241,7 @@
Local is superset:
- $ stop
+ $ tstop
$ hg clone main subset2 --rev name2
adding changesets
adding manifests
@@ -249,7 +249,7 @@
added 6 changesets with 12 changes to 2 files
updating to branch name2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ start subset2
+ $ tstart subset2
$ cd main
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -291,7 +291,7 @@
Partial pull:
- $ stop ; start main
+ $ tstop ; tstart main
$ hg clone $remote partial --rev name2
abort: partial pull cannot be done because other repository doesn't support changegroupsubset.
[255]
@@ -306,5 +306,5 @@
[255]
$ cd ..
- $ stop
+ $ tstop