equal
deleted
inserted
replaced
26 $ hg bookmark changea |
26 $ hg bookmark changea |
27 $ hg up 1 |
27 $ hg up 1 |
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
29 $ echo a >> a |
29 $ echo a >> a |
30 $ hg amend -m changea |
30 $ hg amend -m changea |
31 1 new unstables changesets |
31 1 new unstable changesets |
32 $ hg stabilize -v |
32 $ hg stabilize -v |
33 move:[2] changea |
33 move:[2] changea |
34 atop:[4] changea |
34 atop:[4] changea |
35 hg rebase -Dr cce2c55b8965 -d 1447e1c4828d |
35 hg rebase -Dr cce2c55b8965 -d 1447e1c4828d |
36 resolving manifests |
36 resolving manifests |
67 $ hg gdown |
67 $ hg gdown |
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69 [4] changea |
69 [4] changea |
70 $ echo 'a' > a |
70 $ echo 'a' > a |
71 $ hg amend |
71 $ hg amend |
72 1 new unstables changesets |
72 1 new unstable changesets |
73 $ hg stabilize |
73 $ hg stabilize |
74 move:[5] newer a |
74 move:[5] newer a |
75 atop:[7] changea |
75 atop:[7] changea |
76 merging a |
76 merging a |
77 warning: conflicts during merge. |
77 warning: conflicts during merge. |
130 $ hg amend |
130 $ hg amend |
131 |
131 |
132 Make precursors public |
132 Make precursors public |
133 |
133 |
134 $ hg phase --public 8 |
134 $ hg phase --public 8 |
135 1 new latecomers changesets |
135 1 new latecomer changesets |
136 $ glog |
136 $ glog |
137 @ 12:15c83af6f3a3@default(draft) bk:[] newer a |
137 @ 12:15c83af6f3a3@default(draft) bk:[] newer a |
138 | |
138 | |
139 o 9:355c5cda4de1@default(draft) bk:[] add c |
139 o 9:355c5cda4de1@default(draft) bk:[] add c |
140 | |
140 | |
209 $ mv a a.old |
209 $ mv a a.old |
210 $ echo 'jungle' > a |
210 $ echo 'jungle' > a |
211 $ cat a.old >> a |
211 $ cat a.old >> a |
212 $ rm a.old |
212 $ rm a.old |
213 $ hg amend |
213 $ hg amend |
214 2 new conflictings changesets |
214 2 new conflicting changesets |
215 $ glog |
215 $ glog |
216 @ 19:3883461cc228@default(draft) bk:[] More addition |
216 @ 19:3883461cc228@default(draft) bk:[] More addition |
217 | |
217 | |
218 | o 17:4754d61bc2db@default(draft) bk:[] More addition |
218 | o 17:4754d61bc2db@default(draft) bk:[] More addition |
219 |/ |
219 |/ |