Mercurial > hg

diff tests/test-bookmarks-pushpull.t @ 15613:2fad18f15409

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: shadow divergent bookmarks of foo with foo@n
author Matt Mackall <mpm@selenic.com>
date Tue, 06 Dec 2011 14:17:33 -0600
parents c5c9ca3719f9
children 260a6449d83a
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t	Tue Dec 06 13:21:45 2011 +0100
+++ b/tests/test-bookmarks-pushpull.t	Tue Dec 06 14:17:33 2011 -0600
@@ -117,10 +117,11 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  not updating divergent bookmark X
+  divergent bookmark X stored as X@1
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg book
    * X                         1:9b140be10808
+     X@1                       2:0d2164f0ce0d
      Y                         0:4e3505fd9583
      foo                       -1:000000000000
      foobar                    -1:000000000000
@@ -175,7 +176,7 @@
   $ hg pull -B Z http://localhost:$HGPORT/
   pulling from http://localhost:$HGPORT/
   no changes found
-  not updating divergent bookmark X
+  divergent bookmark X stored as X@1
   importing bookmark Z
   $ hg clone http://localhost:$HGPORT/ cloned-bookmarks
   requesting all changes