equal
deleted
inserted
replaced
30 |
30 |
31 $ echo A > b |
31 $ echo A > b |
32 $ hg add b |
32 $ hg add b |
33 $ hg commit -m ab --amend |
33 $ hg commit -m ab --amend |
34 $ hg up --hidden 1 |
34 $ hg up --hidden 1 |
35 updating to a hidden changeset [0-9a-f]{12} (re) |
|
36 (hidden revision '*' was rewritten as: *) (glob) |
|
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
38 working directory parent is obsolete! (*) (glob) |
36 working directory parent is obsolete! (*) (glob) |
39 (use 'hg evolve' to update to its successor: *) (glob) |
37 (use 'hg evolve' to update to its successor: *) (glob) |
40 $ hg log -G |
38 $ hg log -G |
41 o 2:[0-9a-f]{12} ab (re) |
39 o 2:[0-9a-f]{12} ab (re) |
44 |
42 |
45 $ hg touch . |
43 $ hg touch . |
46 [1] a |
44 [1] a |
47 reviving this changeset will create divergence unless you make a duplicate. |
45 reviving this changeset will create divergence unless you make a duplicate. |
48 (a)llow divergence or (d)uplicate the changeset? a |
46 (a)llow divergence or (d)uplicate the changeset? a |
49 2 new content-divergent changesets |
|
50 $ hg log -G |
47 $ hg log -G |
51 @ 3:[0-9a-f]{12} a (re) |
48 @ 3:[0-9a-f]{12} a (re) |
52 |
49 |
53 \* 2:[0-9a-f]{12} ab (re) |
50 o 2:[0-9a-f]{12} ab (re) |
54 |
51 |
55 $ hg prune 3 |
52 $ hg prune 3 |
56 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
53 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
57 working directory now at 000000000000 |
54 working directory now at 000000000000 |
58 1 changesets pruned |
55 1 changesets pruned |
107 R gna1 |
104 R gna1 |
108 $ hg up .^ |
105 $ hg up .^ |
109 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
106 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
110 |
107 |
111 $ hg touch |
108 $ hg touch |
112 1 new orphan changesets |
|
113 |
109 |
114 $ hg log -G --hidden |
110 $ hg log -G --hidden |
115 @ 11:[0-9a-f]{12} gna1 (re) |
111 @ 11:[0-9a-f]{12} gna1 (re) |
116 | |
112 | |
117 . \* 10:[0-9a-f]{12} move (re) |
113 . o 10:[0-9a-f]{12} move (re) |
118 | | |
114 | | |
119 . x 9:[0-9a-f]{12} gna1 (re) |
115 . x 9:[0-9a-f]{12} gna1 (re) |
120 |/ |
116 |/ |
121 o 8:[0-9a-f]{12} d (re) |
117 o 8:[0-9a-f]{12} d (re) |
122 | |
118 | |
145 R gna1 |
141 R gna1 |
146 |
142 |
147 check that the --duplicate option does not create divergence |
143 check that the --duplicate option does not create divergence |
148 |
144 |
149 $ hg touch --duplicate 10 --hidden |
145 $ hg touch --duplicate 10 --hidden |
150 1 new orphan changesets |
|
151 |
146 |
152 check that reviving a changeset with no successor does not show the prompt |
147 check that reviving a changeset with no successor does not show the prompt |
153 |
148 |
154 $ hg prune 13 |
149 $ hg prune 13 |
155 1 changesets pruned |
150 1 changesets pruned |
156 $ hg touch 13 --hidden --note "testing with no successor" |
151 $ hg touch 13 --hidden --note "testing with no successor" |
157 1 new orphan changesets |
|
158 $ hg obslog -r 13 --hidden |
152 $ hg obslog -r 13 --hidden |
159 x [0-9a-f]{12} (.*) move (re) |
153 x [0-9a-f]{12} (.*) move (re) |
160 pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
154 pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
161 rewritten(.*) as [0-9a-f]{12} using touch by test (.*) (re) |
155 rewritten(.*) as [0-9a-f]{12} using touch by test (.*) (re) |
162 note: testing with no successor |
156 note: testing with no successor |