Mercurial > public > mercurial-scm > hg

diff tests/test-bookmarks-pushpull.t @ 15614:260a6449d83a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
author Matt Mackall <mpm@selenic.com>
date Wed, 07 Dec 2011 16:19:39 -0600
parents 2fad18f15409
children 79cc89de5be1
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t	Tue Dec 06 14:17:33 2011 -0600
+++ b/tests/test-bookmarks-pushpull.t	Wed Dec 07 16:19:39 2011 -0600
@@ -110,18 +110,18 @@
      foo                       -1:000000000000
      foobar                    -1:000000000000
 
-  $ hg pull ../a
-  pulling from ../a
+  $ hg pull --config paths.foo=../a foo
+  pulling from $TESTTMP/a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  divergent bookmark X stored as X@1
+  divergent bookmark X stored as X@foo
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg book
    * X                         1:9b140be10808
-     X@1                       2:0d2164f0ce0d
+     X@foo                     2:0d2164f0ce0d
      Y                         0:4e3505fd9583
      foo                       -1:000000000000
      foobar                    -1:000000000000