equal
deleted
inserted
replaced
39 o 3:[0-9a-f]{12} ab (re) |
39 o 3:[0-9a-f]{12} ab (re) |
40 |
40 |
41 @ 1:[0-9a-f]{12} a (re) |
41 @ 1:[0-9a-f]{12} a (re) |
42 |
42 |
43 $ hg touch . |
43 $ hg touch . |
|
44 [1] a |
|
45 reviving this changeset will create divergence unless you make a duplicate. |
|
46 (a)llow divergence or (d)uplicate the changeset? a |
44 2 new divergent changesets |
47 2 new divergent changesets |
45 $ hg log -G |
48 $ hg log -G |
46 @ 4:[0-9a-f]{12} a (re) |
49 @ 4:[0-9a-f]{12} a (re) |
47 |
50 |
48 o 3:[0-9a-f]{12} ab (re) |
51 o 3:[0-9a-f]{12} ab (re) |
108 rebasing 11:* "move" (glob) |
111 rebasing 11:* "move" (glob) |
109 $ hg st -C --change=tip |
112 $ hg st -C --change=tip |
110 A gna2 |
113 A gna2 |
111 gna1 |
114 gna1 |
112 R gna1 |
115 R gna1 |
|
116 |
|
117 check that the --duplicate option does not create divergence |
|
118 |
|
119 $ hg touch --duplicate 11 --hidden |
|
120 1 new unstable changesets |
|
121 |
|
122 check that reviving a changeset with no successor does not show the prompt |
|
123 |
|
124 $ hg prune 14 |
|
125 1 changesets pruned |
|
126 $ hg touch 14 --hidden |
|
127 1 new unstable changesets |