tests/test-bookmarks.t
changeset 21503 10f15e34d86c
parent 21404 ca275f7ec576
child 22091 f72b71ba756b
equal deleted inserted replaced
21502:f8515564d617 21503:10f15e34d86c
   116 
   116 
   117   $ hg bookmark -r 0 Z
   117   $ hg bookmark -r 0 Z
   118 
   118 
   119   $ hg update X
   119   $ hg update X
   120   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   120   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
   121   (activating bookmark X)
   121   $ echo c > c
   122   $ echo c > c
   122   $ hg add c
   123   $ hg add c
   123   $ hg commit -m 2
   124   $ hg commit -m 2
   124   created new head
   125   created new head
   125 
   126 
   499   commit: 1 added, 1 unknown (new branch head)
   500   commit: 1 added, 1 unknown (new branch head)
   500   update: 2 new changesets (update)
   501   update: 2 new changesets (update)
   501   $ hg update
   502   $ hg update
   502   updating to active bookmark Z
   503   updating to active bookmark Z
   503   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   504   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   505   (activating bookmark Z)
   504   $ hg bookmarks
   506   $ hg bookmarks
   505      X2                        1:925d80f479bb
   507      X2                        1:925d80f479bb
   506      Y                         2:db815d6d32e6
   508      Y                         2:db815d6d32e6
   507    * Z                         3:125c9a1d6df6
   509    * Z                         3:125c9a1d6df6
   508      x  y                      2:db815d6d32e6
   510      x  y                      2:db815d6d32e6
   511 
   513 
   512   $ hg bookmark -r3 Y
   514   $ hg bookmark -r3 Y
   513   moving bookmark 'Y' forward from db815d6d32e6
   515   moving bookmark 'Y' forward from db815d6d32e6
   514   $ hg -R cloned-bookmarks-update update Y
   516   $ hg -R cloned-bookmarks-update update Y
   515   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   517   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   518   (activating bookmark Y)
   516   $ hg -R cloned-bookmarks-update pull --update .
   519   $ hg -R cloned-bookmarks-update pull --update .
   517   pulling from .
   520   pulling from .
   518   searching for changes
   521   searching for changes
   519   adding changesets
   522   adding changesets
   520   adding manifests
   523   adding manifests