comparison 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
comparison
equal deleted inserted replaced
528:6df6580646b9 529:33a6be414903
1 1) repository with 2 bookmarks (base for tests):
2
3 o 5:e052c89b1159 merge 3 [bookmark2]
4 |\
5 | o 4:e9f8f67888f5 test 1
6 | |
7 o | 3:15b4a116520d 3 [bookmark1]
8 | |
9 o | 2:c17933ca5f6e 2
10 |/
11 o 1:016d505d681f 1
12 |
13 o 0:121c31c787d1 initial
14
15
16 2) bookmark1 udpated:
17
18 o 6:7597a4da7195 4 [bookmark1]
19 |
20 o 5:e052c89b1159 merge 3 [bookmark2]
21 |\
22 | o 4:e9f8f67888f5 test 1
23 | |
24 o | 3:15b4a116520d 3
25 | |
26 o | 2:c17933ca5f6e 2
27 |/
28 o 1:016d505d681f 1
29 |
30 o 0:121c31c787d1 initial
31
32
33 3) all bookmarks removed
34
35
36 4) bookmark1 diverged
37
38 o 6:7597a4da7195 4 [bookmark2]
39 |
40 o 5:e052c89b1159 merge 3
41 |\
42 | o 4:e9f8f67888f5 test 1 [bookmark1]
43 | |
44 o | 3:15b4a116520d 3
45 | |
46 o | 2:c17933ca5f6e 2
47 |/
48 o 1:016d505d681f 1
49 |
50 o 0:121c31c787d1 initial
51
52
53 5) branch with name 'bookmark2' created:
54
55 o 7:f63a14e873d6 Create branch bookmark2 (bookmark2)
56 |
57 o 6:7597a4da7195 4 [bookmark2]
58 |
59 o 5:e052c89b1159 merge 3
60 |\
61 | o 4:e9f8f67888f5 test 1 [bookmark1]
62 | |
63 o | 3:15b4a116520d 3
64 | |
65 o | 2:c17933ca5f6e 2
66 |/
67 o 1:016d505d681f 1
68 |
69 o 0:121c31c787d1 initial