tests/test-bookmarks-pushpull.t
changeset 35184 ee64e677c3cf
parent 35063 ef8518f14e4e
parent 34979 7384250eabd9
child 35268 ad5f2b923b0d
equal deleted inserted replaced
35183:bdd2e18b54c5 35184:ee64e677c3cf
   259    * X                         1:0d2164f0ce0d
   259    * X                         1:0d2164f0ce0d
   260      Y                         0:4e3505fd9583
   260      Y                         0:4e3505fd9583
   261      Z                         1:0d2164f0ce0d
   261      Z                         1:0d2164f0ce0d
   262 
   262 
   263   $ cd ../b
   263   $ cd ../b
   264   $ hg up --config
   264   $ hg up
   265   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   265   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   266   updating bookmark foobar
   266   updating bookmark foobar
   267   $ echo c2 > f2
   267   $ echo c2 > f2
   268   $ hg ci -Am2
   268   $ hg ci -Am2
   269   adding f2
   269   adding f2