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