Show More
@@ -1,116 +1,116 b'' | |||
|
1 | 1 | $ echo "[extensions]" >> $HGRCPATH |
|
2 | 2 | $ echo "mq=" >> $HGRCPATH |
|
3 | 3 | |
|
4 | 4 | $ hg init |
|
5 | 5 | |
|
6 | 6 | $ echo qqq>qqq.txt |
|
7 | 7 | |
|
8 | 8 | rollback dry run without rollback information |
|
9 | 9 | |
|
10 | 10 | $ hg rollback |
|
11 | 11 | no rollback information available |
|
12 | 12 | [1] |
|
13 | 13 | |
|
14 | 14 | add file |
|
15 | 15 | |
|
16 | 16 | $ hg add |
|
17 | 17 | adding qqq.txt |
|
18 | 18 | |
|
19 | 19 | commit first revision |
|
20 | 20 | |
|
21 | 21 | $ hg ci -m 1 |
|
22 | 22 | |
|
23 | 23 | set bookmark |
|
24 | 24 | |
|
25 | 25 | $ hg book test |
|
26 | 26 | |
|
27 | 27 | $ echo www>>qqq.txt |
|
28 | 28 | |
|
29 | 29 | commit second revision |
|
30 | 30 | |
|
31 | 31 | $ hg ci -m 2 |
|
32 | 32 | |
|
33 | 33 | set bookmark |
|
34 | 34 | |
|
35 | 35 | $ hg book test2 |
|
36 | 36 | |
|
37 |
update to -2 ( |
|
|
37 | update to -2 (deactivates the active bookmark) | |
|
38 | 38 | |
|
39 | 39 | $ hg update -r -2 |
|
40 | 40 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
41 | 41 | |
|
42 | 42 | $ echo eee>>qqq.txt |
|
43 | 43 | |
|
44 | 44 | commit new head |
|
45 | 45 | |
|
46 | 46 | $ hg ci -m 3 |
|
47 | 47 | created new head |
|
48 | 48 | |
|
49 | 49 | bookmarks updated? |
|
50 | 50 | |
|
51 | 51 | $ hg book |
|
52 | 52 | test 1:25e1ee7a0081 |
|
53 | 53 | test2 1:25e1ee7a0081 |
|
54 | 54 | |
|
55 | 55 | strip to revision 1 |
|
56 | 56 | |
|
57 | 57 | $ hg strip 1 |
|
58 | 58 | saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob) |
|
59 | 59 | |
|
60 | 60 | list bookmarks |
|
61 | 61 | |
|
62 | 62 | $ hg book |
|
63 | 63 | test 0:5c9ad3787638 |
|
64 | 64 | test2 0:5c9ad3787638 |
|
65 | 65 | |
|
66 | 66 | immediate rollback and reentrancy issue |
|
67 | 67 | |
|
68 | 68 | $ echo "mq=!" >> $HGRCPATH |
|
69 | 69 | $ hg init repo |
|
70 | 70 | $ cd repo |
|
71 | 71 | $ echo a > a |
|
72 | 72 | $ hg ci -Am adda |
|
73 | 73 | adding a |
|
74 | 74 | $ echo b > b |
|
75 | 75 | $ hg ci -Am addb |
|
76 | 76 | adding b |
|
77 | 77 | $ hg bookmarks markb |
|
78 | 78 | $ hg rollback |
|
79 | 79 | repository tip rolled back to revision 0 (undo commit) |
|
80 | 80 | working directory now based on revision 0 |
|
81 | 81 | |
|
82 | 82 | are you there? |
|
83 | 83 | |
|
84 | 84 | $ hg bookmarks |
|
85 | 85 | no bookmarks set |
|
86 | 86 | |
|
87 | 87 | can we commit? (issue2692) |
|
88 | 88 | |
|
89 | 89 | $ echo c > c |
|
90 | 90 | $ hg ci -Am rockon |
|
91 | 91 | adding c |
|
92 | 92 | |
|
93 | 93 | can you be added again? |
|
94 | 94 | |
|
95 | 95 | $ hg bookmarks markb |
|
96 | 96 | $ hg bookmarks |
|
97 | 97 | * markb 1:fdb34407462c |
|
98 | 98 | |
|
99 | 99 | rollback dry run with rollback information |
|
100 | 100 | |
|
101 | 101 | $ hg rollback -n |
|
102 | 102 | repository tip rolled back to revision 0 (undo commit) |
|
103 | 103 | $ hg bookmarks |
|
104 | 104 | * markb 1:fdb34407462c |
|
105 | 105 | |
|
106 | 106 | rollback dry run with rollback information and no commit undo |
|
107 | 107 | |
|
108 | 108 | $ rm .hg/store/undo |
|
109 | 109 | $ hg rollback -n |
|
110 | 110 | no rollback information available |
|
111 | 111 | [1] |
|
112 | 112 | $ hg bookmarks |
|
113 | 113 | * markb 1:fdb34407462c |
|
114 | 114 | |
|
115 | 115 | $ cd .. |
|
116 | 116 |
General Comments 0
You need to be logged in to leave comments.
Login now