[PATCH 1 of 3] tests: put test-treemanifest.t on a port diet

timeless timeless at gmail.com
Wed Feb 17 15:16:01 EST 2016


On Wed, Feb 17, 2016 at 2:43 PM, timeless <timeless at mozdev.org> wrote:
> @@ -465,14 +467,17 @@
>    $ echo troz >> b/bar/orange/fly/gnat.py
>    $ hg ci -m troz
>
> +Finish first server
> +  $ killdaemons.py
> +
>  Test cloning a treemanifest repo over http.
> -  $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --errorlog=errors.log
> +  $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log
>    $ cat hg.pid >> $DAEMON_PIDS
>    $ cd ..

For someone merging, this hunk is tied to the "Test cloning" line, and
not to the "hg ci -m troz" line -- it will look like tihs:
@@ -498,14 +500,17 @@
   adding meta/b/foo/apple/bees/00manifest.i
   16 items added, 0 removed from fncache

+Finish first server
+  $ killdaemons.py
+
 Test cloning a treemanifest repo over http.
-  $ hg serve -p $HGPORT2 -d --pid-file=hg.pid --errorlog=errors.log
+  $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cd ..
When you resolve the conflict which added some verify stuff.


More information about the Mercurial-devel mailing list