[PATCH 1 of 5 STABLE] bookmark: complexity pull-push test to have deeper tree

Pierre-Yves David pierre-yves.david at ens-lyon.org
Wed Oct 24 17:32:18 CDT 2012


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1351010638 -7200
# Branch stable
# Node ID c142c250a12c75a8485cc636a9b64eab1fd82cd8
# Parent  8ef4b022d56211a1dc4e3a301c1a0906db443916
bookmark: complexity pull-push test to have deeper tree

There is bug in valid test which need such deeper graph to show up. I'm altering
the test here to clearing distinct graft alteration noise and bugfix noise.

diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -1,6 +1,8 @@
   $ "$TESTDIR/hghave" serve || exit 80
 
   $ cat << EOF >> $HGRCPATH
+  > [ui]
+  > logtemplate={rev}:{node|short} {desc|firstline}
   > [phases]
   > publish=False
   > [extensions]
@@ -197,6 +199,22 @@
   $ hg ci -Am4
   adding f2
   created new head
+  $ echo c5 > f2
+  $ hg ci -Am5
+  $ hg log -G
+  @  5:c922c0139ca0 5
+  |
+  o  4:4efff6d98829 4
+  |
+  | o  3:f6fc62dde3c0 3
+  |/
+  | o  2:0d2164f0ce0d 1
+  |/
+  | o  1:9b140be10808 2
+  |/
+  o  0:4e3505fd9583 test
+  
+
   $ hg book -f Y
 
   $ cat <<EOF > ../a/.hg/hgrc
@@ -211,7 +229,7 @@
   $ hg push http://localhost:$HGPORT2/
   pushing to http://localhost:$HGPORT2/
   searching for changes
-  abort: push creates new remote head 4efff6d98829!
+  abort: push creates new remote head c922c0139ca0!
   (did you forget to merge? use push -f to force)
   [255]
   $ hg -R ../a book
@@ -227,7 +245,7 @@
   $ hg push http://localhost:$HGPORT2/
   pushing to http://localhost:$HGPORT2/
   searching for changes
-  abort: push creates new remote head 4efff6d98829!
+  abort: push creates new remote head c922c0139ca0!
   (did you forget to merge? use push -f to force)
   [255]
   $ hg -R ../a book
@@ -241,7 +259,9 @@
   $ hg id --debug -r 3
   f6fc62dde3c0771e29704af56ba4d8af77abcc2f
   $ hg id --debug -r 4
-  4efff6d98829d9c824c621afd6e3f01865f5439f tip Y
+  4efff6d98829d9c824c621afd6e3f01865f5439f
+  $ hg id --debug -r 5
+  c922c0139ca03858f655e4a2af4dd02796a63969 tip Y
   $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f 4efff6d98829d9c824c621afd6e3f01865f5439f
   $ hg push http://localhost:$HGPORT2/
   pushing to http://localhost:$HGPORT2/
@@ -249,12 +269,12 @@
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
-  remote: added 1 changesets with 1 changes to 1 files (+1 heads)
+  remote: added 2 changesets with 2 changes to 1 files (+1 heads)
   updating bookmark Y
   $ hg -R ../a book
      @                         1:0d2164f0ce0d
    * X                         1:0d2164f0ce0d
-     Y                         4:4efff6d98829
+     Y                         5:c922c0139ca0
      Z                         1:0d2164f0ce0d
 
 hgweb
@@ -278,7 +298,7 @@
   @	9b140be1080824d768c5a4691a564088eede71f9
   foo	0000000000000000000000000000000000000000
   foobar	9b140be1080824d768c5a4691a564088eede71f9
-  Y	4efff6d98829d9c824c621afd6e3f01865f5439f
+  Y	c922c0139ca03858f655e4a2af4dd02796a63969
   X	9b140be1080824d768c5a4691a564088eede71f9
   Z	0d2164f0ce0d8f1d6f94351eba04b794909be66c
   $ hg out -B http://localhost:$HGPORT/
@@ -313,13 +333,13 @@
   adding changesets
   adding manifests
   adding file changes
-  added 4 changesets with 4 changes to 3 files (+2 heads)
+  added 5 changesets with 5 changes to 3 files (+2 heads)
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R cloned-bookmarks bookmarks
      @                         1:9b140be10808
      X                         1:9b140be10808
-     Y                         3:4efff6d98829
+     Y                         4:c922c0139ca0
      Z                         2:0d2164f0ce0d
      foo                       -1:000000000000
      foobar                    1:9b140be10808
@@ -333,7 +353,7 @@
   adding changesets
   adding manifests
   adding file changes
-  added 4 changesets with 4 changes to 3 files (+2 heads)
+  added 5 changesets with 5 changes to 3 files (+2 heads)
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd addmarks


More information about the Mercurial-devel mailing list