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