39 |
39 |
40 $ hg up .^^ |
40 $ hg up .^^ |
41 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
41 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
42 $ echo bar > b |
42 $ echo bar > b |
43 $ hg amend |
43 $ hg amend |
44 2 new orphan changesets |
|
45 |
44 |
46 $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True |
45 $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True |
47 rebasing 2:b1661037fa25 "added b" |
46 rebasing 2:b1661037fa25 "added b" |
48 2 new content-divergent changesets |
47 |
49 |
48 $ hg glog |
50 $ hg glog |
49 o 6:da4b96f4a8d6 added b |
51 * 6:da4b96f4a8d6 added b |
|
52 | () [default] draft |
50 | () [default] draft |
53 | @ 5:7ed0642d644b added b |
51 | @ 5:7ed0642d644b added b |
54 | | () [default] draft |
52 | | () [default] draft |
55 | | * 4:c41c793e0ef1 added d |
53 | | o 4:c41c793e0ef1 added d |
56 | | | () [default] draft |
54 | | | () [default] draft |
57 | | * 3:ca1b80f7960a added c |
55 | | o 3:ca1b80f7960a added c |
58 | | | () [default] draft |
56 | | | () [default] draft |
59 | | x 2:b1661037fa25 added b |
57 | | x 2:b1661037fa25 added b |
60 | |/ () [default] draft |
58 | |/ () [default] draft |
61 | o 1:c7586e2a9264 added a |
59 | o 1:c7586e2a9264 added a |
62 |/ () [default] draft |
60 |/ () [default] draft |
72 working directory is now at 171614c9a791 |
70 working directory is now at 171614c9a791 |
73 |
71 |
74 $ hg glog |
72 $ hg glog |
75 @ 8:171614c9a791 added b |
73 @ 8:171614c9a791 added b |
76 | () [default] draft |
74 | () [default] draft |
77 | * 4:c41c793e0ef1 added d |
75 | o 4:c41c793e0ef1 added d |
78 | | () [default] draft |
76 | | () [default] draft |
79 | * 3:ca1b80f7960a added c |
77 | o 3:ca1b80f7960a added c |
80 | | () [default] draft |
78 | | () [default] draft |
81 | x 2:b1661037fa25 added b |
79 | x 2:b1661037fa25 added b |
82 |/ () [default] draft |
80 |/ () [default] draft |
83 o 1:c7586e2a9264 added a |
81 o 1:c7586e2a9264 added a |
84 | () [default] draft |
82 | () [default] draft |
132 marked working directory as branch bar |
130 marked working directory as branch bar |
133 (branches are permanent and global, did you want a bookmark?) |
131 (branches are permanent and global, did you want a bookmark?) |
134 $ hg amend -m "added foo to x" |
132 $ hg amend -m "added foo to x" |
135 |
133 |
136 $ hg up 71a392c714b5 --hidden |
134 $ hg up 71a392c714b5 --hidden |
137 updating to a hidden changeset 71a392c714b5 |
|
138 (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) |
|
139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
140 working directory parent is obsolete! (71a392c714b5) |
136 working directory parent is obsolete! (71a392c714b5) |
141 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
137 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
142 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
138 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
143 rebasing 11:71a392c714b5 "added x" |
139 rebasing 11:71a392c714b5 "added x" |
144 2 new content-divergent changesets |
|
145 |
140 |
146 $ hg glog |
141 $ hg glog |
147 @ 13:1e4f6b3bb39b added x |
142 @ 13:1e4f6b3bb39b added x |
148 | () [default] draft |
143 | () [default] draft |
149 | * 12:1e1a50385a7d added foo to x |
144 | o 12:1e1a50385a7d added foo to x |
150 | | () [bar] draft |
145 | | () [bar] draft |
151 o | 10:4ae4427ee9f8 added d |
146 o | 10:4ae4427ee9f8 added d |
152 | | () [default] draft |
147 | | () [default] draft |
153 o | 9:917281f93fcb added c |
148 o | 9:917281f93fcb added c |
154 |/ () [default] draft |
149 |/ () [default] draft |
215 |
210 |
216 $ echo bar > y |
211 $ echo bar > y |
217 $ hg amend |
212 $ hg amend |
218 |
213 |
219 $ hg up fc6ad2bac162 --hidden |
214 $ hg up fc6ad2bac162 --hidden |
220 updating to a hidden changeset fc6ad2bac162 |
|
221 (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) |
|
222 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
215 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
223 working directory parent is obsolete! (fc6ad2bac162) |
216 working directory parent is obsolete! (fc6ad2bac162) |
224 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
217 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
225 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
218 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
226 rebasing 16:fc6ad2bac162 "added y" |
219 rebasing 16:fc6ad2bac162 "added y" |
227 2 new content-divergent changesets |
|
228 $ echo wat > y |
220 $ echo wat > y |
229 $ hg amend |
221 $ hg amend |
230 |
222 |
231 $ hg glog |
223 $ hg glog |
232 @ 19:b4575ed6fcfc added y |
224 @ 19:b4575ed6fcfc added y |
233 | () [bar] draft |
225 | () [bar] draft |
234 | * 17:2a9f6ccbdeba added y |
226 | o 17:2a9f6ccbdeba added y |
235 | | () [default] draft |
227 | | () [default] draft |
236 o | 15:b006cf317e0e added foo to x |
228 o | 15:b006cf317e0e added foo to x |
237 | | () [bar] draft |
229 | | () [bar] draft |
238 o | 10:4ae4427ee9f8 added d |
230 o | 10:4ae4427ee9f8 added d |
239 | | () [default] draft |
231 | | () [default] draft |
348 $ echo foo > y |
340 $ echo foo > y |
349 $ hg add y |
341 $ hg add y |
350 $ hg amend |
342 $ hg amend |
351 |
343 |
352 $ hg up daf1de08f3b0 --hidden |
344 $ hg up daf1de08f3b0 --hidden |
353 updating to a hidden changeset daf1de08f3b0 |
|
354 (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) |
|
355 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
345 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
356 working directory parent is obsolete! (daf1de08f3b0) |
346 working directory parent is obsolete! (daf1de08f3b0) |
357 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
347 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
358 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
348 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
359 rebasing 22:daf1de08f3b0 "added z" |
349 rebasing 22:daf1de08f3b0 "added z" |
360 2 new content-divergent changesets |
|
361 $ echo bar > z |
350 $ echo bar > z |
362 $ hg amend |
351 $ hg amend |
363 |
352 |
364 $ hg glog |
353 $ hg glog |
365 @ 25:53242575ffa9 added z |
354 @ 25:53242575ffa9 added z |
366 | () [bar] draft |
355 | () [bar] draft |
367 | * 23:3f7a1f693080 added z |
356 | o 23:3f7a1f693080 added z |
368 | | () [default] draft |
357 | | () [default] draft |
369 o | 21:7bbcf24ddecf added y |
358 o | 21:7bbcf24ddecf added y |
370 | | () [bar] draft |
359 | | () [bar] draft |
371 o | 15:b006cf317e0e added foo to x |
360 o | 15:b006cf317e0e added foo to x |
372 | | () [bar] draft |
361 | | () [bar] draft |