view mercurial-tests/testData/bookmarks/README @ 529:33a6be414903

TW-17489 support bookmarks Now they can be used in the branch and branch spec fields
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Sat, 29 Dec 2012 18:32:56 +0400
parents
children
line wrap: on
line source
1) repository with 2 bookmarks (base for tests):

o    5:e052c89b1159 merge 3 [bookmark2]
|\
| o  4:e9f8f67888f5 test 1
| |
o |  3:15b4a116520d 3 [bookmark1]
| |
o |  2:c17933ca5f6e 2
|/
o  1:016d505d681f 1
|
o  0:121c31c787d1 initial


2) bookmark1 udpated:

o  6:7597a4da7195 4 [bookmark1]
|
o    5:e052c89b1159 merge 3 [bookmark2]
|\
| o  4:e9f8f67888f5 test 1
| |
o |  3:15b4a116520d 3
| |
o |  2:c17933ca5f6e 2
|/
o  1:016d505d681f 1
|
o  0:121c31c787d1 initial


3) all bookmarks removed


4) bookmark1 diverged

o  6:7597a4da7195 4 [bookmark2]
|
o    5:e052c89b1159 merge 3
|\
| o  4:e9f8f67888f5 test 1 [bookmark1]
| |
o |  3:15b4a116520d 3
| |
o |  2:c17933ca5f6e 2
|/
o  1:016d505d681f 1
|
o  0:121c31c787d1 initial


5) branch with name 'bookmark2' created:

o  7:f63a14e873d6 Create branch bookmark2 (bookmark2)
|
o  6:7597a4da7195 4 [bookmark2]
|
o    5:e052c89b1159 merge 3
|\
| o  4:e9f8f67888f5 test 1 [bookmark1]
| |
o |  3:15b4a116520d 3
| |
o |  2:c17933ca5f6e 2
|/
o  1:016d505d681f 1
|
o  0:121c31c787d1 initial