64 () [default] draft |
64 () [default] draft |
65 |
65 |
66 $ hg evolve --content-divergent --config ui.interactive=True<<EOF |
66 $ hg evolve --content-divergent --config ui.interactive=True<<EOF |
67 > c |
67 > c |
68 > EOF |
68 > EOF |
69 merge:[6] added d |
69 merge:[8] added d |
70 with: [5] added d |
70 with: [6] added d |
71 base: [4] added d |
71 base: [4] added d |
72 merging "other" content-divergent changeset 'bdeedce1f621' |
72 merging "other" divergent changeset 'bdeedce1f621' |
73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
74 content divergent changesets on different branches. |
74 content divergent changesets on different branches. |
75 choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c |
75 choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c |
76 working directory is now at 0ac42f1bc15c |
76 working directory is now at 0ac42f1bc15c |
77 |
77 |
78 $ hg glog |
78 $ hg glog |
79 @ 7:0ac42f1bc15c added d |
79 @ 9:0ac42f1bc15c added d |
80 | () [foobar] draft |
80 | () [foobar] draft |
81 o 3:ca1b80f7960a added c |
81 o 3:ca1b80f7960a added c |
82 | () [default] draft |
82 | () [default] draft |
83 o 2:b1661037fa25 added b |
83 o 2:b1661037fa25 added b |
84 | () [default] draft |
84 | () [default] draft |
119 | () [default] draft |
119 | () [default] draft |
120 o 0:8fa14d15e168 added hgignore |
120 o 0:8fa14d15e168 added hgignore |
121 () [default] draft |
121 () [default] draft |
122 |
122 |
123 $ hg evolve --content-divergent |
123 $ hg evolve --content-divergent |
124 merge:[9] added a d with bar in it, expect some beers |
124 merge:[12] added a d with bar in it, expect some beers |
125 with: [8] added d |
125 with: [11] added d |
126 base: [7] added d |
126 base: [9] added d |
127 merging "other" content-divergent changeset 'f621d00f5f0e' |
127 merging "other" divergent changeset 'f621d00f5f0e' |
128 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
128 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
129 working directory is now at a9d6fd6b5e40 |
129 working directory is now at a9d6fd6b5e40 |
130 |
130 |
131 $ hg glog |
131 $ hg glog |
132 @ 10:a9d6fd6b5e40 added a d with bar in it, expect some beers |
132 @ 13:a9d6fd6b5e40 added a d with bar in it, expect some beers |
133 | () [default] draft |
133 | () [default] draft |
134 o 3:ca1b80f7960a added c |
134 o 3:ca1b80f7960a added c |
135 | () [default] draft |
135 | () [default] draft |
136 o 2:b1661037fa25 added b |
136 o 2:b1661037fa25 added b |
137 | () [default] draft |
137 | () [default] draft |
149 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
150 working directory parent is obsolete! (a9d6fd6b5e40) |
150 working directory parent is obsolete! (a9d6fd6b5e40) |
151 (use 'hg evolve' to update to its successor: b10b07a394f1) |
151 (use 'hg evolve' to update to its successor: b10b07a394f1) |
152 $ echo babar > d |
152 $ echo babar > d |
153 $ hg amend -m "foo to d" |
153 $ hg amend -m "foo to d" |
154 2 new content-divergent changesets |
154 2 new divergent changesets |
155 |
155 |
156 $ hg glog |
156 $ hg glog |
157 @ 12:0bb497fed24a foo to d |
157 @ 17:0bb497fed24a foo to d |
158 | () [default] draft |
158 | () [default] draft |
159 | o 11:b10b07a394f1 foo to d |
159 | o 15:b10b07a394f1 foo to d |
160 |/ () [default] draft |
160 |/ () [default] draft |
161 o 3:ca1b80f7960a added c |
161 o 3:ca1b80f7960a added c |
162 | () [default] draft |
162 | () [default] draft |
163 o 2:b1661037fa25 added b |
163 o 2:b1661037fa25 added b |
164 | () [default] draft |
164 | () [default] draft |
166 | () [default] draft |
166 | () [default] draft |
167 o 0:8fa14d15e168 added hgignore |
167 o 0:8fa14d15e168 added hgignore |
168 () [default] draft |
168 () [default] draft |
169 |
169 |
170 $ hg evolve --content-divergent |
170 $ hg evolve --content-divergent |
171 merge:[12] foo to d |
171 merge:[17] foo to d |
172 with: [11] foo to d |
172 with: [15] foo to d |
173 base: [10] added a d with bar in it, expect some beers |
173 base: [13] added a d with bar in it, expect some beers |
174 merging "other" content-divergent changeset 'b10b07a394f1' |
174 merging "other" divergent changeset 'b10b07a394f1' |
175 merging d |
175 merging d |
176 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
176 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
177 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
177 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
178 fix conflicts and see `hg help evolve.interrupted` |
178 fix conflicts and see `hg help evolve.interrupted` |
179 [1] |
179 [1] |
207 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
207 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
208 working directory parent is obsolete! (11175423b5dc) |
208 working directory parent is obsolete! (11175423b5dc) |
209 (use 'hg evolve' to update to its successor: 27f0463f169a) |
209 (use 'hg evolve' to update to its successor: 27f0463f169a) |
210 $ echo wat > d |
210 $ echo wat > d |
211 $ hg amend -m "wat to d, wat?" |
211 $ hg amend -m "wat to d, wat?" |
212 2 new content-divergent changesets |
212 2 new divergent changesets |
213 |
213 |
214 $ hg glog |
214 $ hg glog |
215 @ 15:f542037ddf31 wat to d, wat? |
215 @ 22:f542037ddf31 wat to d, wat? |
216 | () [default] draft |
216 | () [default] draft |
217 | o 14:27f0463f169a bar to d, expect beers |
217 | o 20:27f0463f169a bar to d, expect beers |
218 |/ () [default] draft |
218 |/ () [default] draft |
219 o 3:ca1b80f7960a added c |
219 o 3:ca1b80f7960a added c |
220 | () [default] draft |
220 | () [default] draft |
221 o 2:b1661037fa25 added b |
221 o 2:b1661037fa25 added b |
222 | () [default] draft |
222 | () [default] draft |
224 | () [default] draft |
224 | () [default] draft |
225 o 0:8fa14d15e168 added hgignore |
225 o 0:8fa14d15e168 added hgignore |
226 () [default] draft |
226 () [default] draft |
227 |
227 |
228 $ hg evolve --content-divergent |
228 $ hg evolve --content-divergent |
229 merge:[15] wat to d, wat? |
229 merge:[22] wat to d, wat? |
230 with: [14] bar to d, expect beers |
230 with: [20] bar to d, expect beers |
231 base: [13] foo to d |
231 base: [18] foo to d |
232 merging "other" content-divergent changeset '27f0463f169a' |
232 merging "other" divergent changeset '27f0463f169a' |
233 merging d |
233 merging d |
234 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
234 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
235 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
235 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
236 fix conflicts and see `hg help evolve.interrupted` |
236 fix conflicts and see `hg help evolve.interrupted` |
237 [1] |
237 [1] |
305 |
305 |
306 $ hg up .^^ |
306 $ hg up .^^ |
307 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
307 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
308 $ echo bar > b |
308 $ echo bar > b |
309 $ hg amend |
309 $ hg amend |
310 2 new orphan changesets |
310 2 new unstable changesets |
311 |
311 |
312 $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True |
312 $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True |
313 rebasing 2:b1661037fa25 "added b" |
313 rebasing 2:b1661037fa25 "added b" |
314 2 new content-divergent changesets |
314 2 new divergent changesets |
315 |
315 |
316 $ hg glog |
316 $ hg glog |
317 o 6:da4b96f4a8d6 added b |
317 o 7:da4b96f4a8d6 added b |
318 | () [default] draft |
318 | () [default] draft |
319 | @ 5:7ed0642d644b added b |
319 | @ 6:7ed0642d644b added b |
320 | | () [default] draft |
320 | | () [default] draft |
321 | | o 4:c41c793e0ef1 added d |
321 | | o 4:c41c793e0ef1 added d |
322 | | | () [default] draft |
322 | | | () [default] draft |
323 | | o 3:ca1b80f7960a added c |
323 | | o 3:ca1b80f7960a added c |
324 | | | () [default] draft |
324 | | | () [default] draft |
328 |/ () [default] draft |
328 |/ () [default] draft |
329 o 0:8fa14d15e168 added hgignore |
329 o 0:8fa14d15e168 added hgignore |
330 () [default] draft |
330 () [default] draft |
331 |
331 |
332 $ hg evolve --content-divergent |
332 $ hg evolve --content-divergent |
333 merge:[5] added b |
333 merge:[6] added b |
334 with: [6] added b |
334 with: [7] added b |
335 base: [2] added b |
335 base: [2] added b |
336 rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264 |
336 rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264 |
337 updating to "local" side of the conflict: 7ed0642d644b |
337 updating to "local" side of the conflict: 7ed0642d644b |
338 merging "other" content-divergent changeset '11f849d7159f' |
338 merging "other" divergent changeset '11f849d7159f' |
339 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
339 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
340 working directory is now at 171614c9a791 |
340 working directory is now at 171614c9a791 |
341 |
341 |
342 $ hg glog |
342 $ hg glog |
343 @ 8:171614c9a791 added b |
343 @ 9:171614c9a791 added b |
344 | () [default] draft |
344 | () [default] draft |
345 | o 4:c41c793e0ef1 added d |
345 | o 4:c41c793e0ef1 added d |
346 | | () [default] draft |
346 | | () [default] draft |
347 | o 3:ca1b80f7960a added c |
347 | o 3:ca1b80f7960a added c |
348 | | () [default] draft |
348 | | () [default] draft |
406 |
406 |
407 $ hg up 71a392c714b5 --hidden |
407 $ hg up 71a392c714b5 --hidden |
408 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
408 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
409 working directory parent is obsolete! (71a392c714b5) |
409 working directory parent is obsolete! (71a392c714b5) |
410 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
410 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
411 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
411 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True |
412 rebasing 11:71a392c714b5 "added x" |
412 rebasing 12:71a392c714b5 "added x" |
413 2 new content-divergent changesets |
413 2 new divergent changesets |
414 |
414 |
415 $ hg glog |
415 $ hg glog |
416 @ 13:1e4f6b3bb39b added x |
416 @ 15:1e4f6b3bb39b added x |
417 | () [default] draft |
417 | () [default] draft |
418 | o 12:1e1a50385a7d added foo to x |
418 | o 14:1e1a50385a7d added foo to x |
419 | | () [bar] draft |
419 | | () [bar] draft |
420 o | 10:4ae4427ee9f8 added d |
420 o | 11:4ae4427ee9f8 added d |
421 | | () [default] draft |
421 | | () [default] draft |
422 o | 9:917281f93fcb added c |
422 o | 10:917281f93fcb added c |
423 |/ () [default] draft |
423 |/ () [default] draft |
424 o 8:171614c9a791 added b |
424 o 9:171614c9a791 added b |
425 | () [default] draft |
425 | () [default] draft |
426 o 1:c7586e2a9264 added a |
426 o 1:c7586e2a9264 added a |
427 | () [default] draft |
427 | () [default] draft |
428 o 0:8fa14d15e168 added hgignore |
428 o 0:8fa14d15e168 added hgignore |
429 () [default] draft |
429 () [default] draft |
430 |
430 |
431 $ hg evolve --content-divergent |
431 $ hg evolve --content-divergent |
432 merge:[13] added x |
432 merge:[15] added x |
433 with: [12] added foo to x |
433 with: [14] added foo to x |
434 base: [11] added x |
434 base: [12] added x |
435 rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8 |
435 rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8 |
436 updating to "local" side of the conflict: 1e4f6b3bb39b |
436 updating to "local" side of the conflict: 1e4f6b3bb39b |
437 merging "other" content-divergent changeset '80cc9b1ec650' |
437 merging "other" divergent changeset '80cc9b1ec650' |
438 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
438 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
439 working directory is now at b006cf317e0e |
439 working directory is now at b006cf317e0e |
440 |
440 |
441 $ hg exp |
441 $ hg exp |
442 # HG changeset patch |
442 # HG changeset patch |
478 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
478 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
479 |
479 |
480 $ echo y > y |
480 $ echo y > y |
481 $ hg ci -Aqm "added y" |
481 $ hg ci -Aqm "added y" |
482 $ hg glog -r . |
482 $ hg glog -r . |
483 @ 16:fc6ad2bac162 added y |
483 @ 18:fc6ad2bac162 added y |
484 | () [default] draft |
484 | () [default] draft |
485 ~ |
485 ~ |
486 |
486 |
487 $ echo bar > y |
487 $ echo bar > y |
488 $ hg amend |
488 $ hg amend |
489 |
489 |
490 $ hg up fc6ad2bac162 --hidden |
490 $ hg up fc6ad2bac162 --hidden |
491 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
491 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
492 working directory parent is obsolete! (fc6ad2bac162) |
492 working directory parent is obsolete! (fc6ad2bac162) |
493 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
493 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
494 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
494 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True |
495 rebasing 16:fc6ad2bac162 "added y" |
495 rebasing 18:fc6ad2bac162 "added y" |
496 2 new content-divergent changesets |
496 2 new divergent changesets |
497 $ echo wat > y |
497 $ echo wat > y |
498 $ hg amend |
498 $ hg amend |
499 |
499 |
500 $ hg glog |
500 $ hg glog |
501 @ 19:b4575ed6fcfc added y |
501 @ 23:b4575ed6fcfc added y |
502 | () [bar] draft |
502 | () [bar] draft |
503 | o 17:2a9f6ccbdeba added y |
503 | o 20:2a9f6ccbdeba added y |
504 | | () [default] draft |
504 | | () [default] draft |
505 o | 15:b006cf317e0e added foo to x |
505 o | 17:b006cf317e0e added foo to x |
506 | | () [bar] draft |
506 | | () [bar] draft |
507 o | 10:4ae4427ee9f8 added d |
507 o | 11:4ae4427ee9f8 added d |
508 | | () [default] draft |
508 | | () [default] draft |
509 o | 9:917281f93fcb added c |
509 o | 10:917281f93fcb added c |
510 |/ () [default] draft |
510 |/ () [default] draft |
511 o 8:171614c9a791 added b |
511 o 9:171614c9a791 added b |
512 | () [default] draft |
512 | () [default] draft |
513 o 1:c7586e2a9264 added a |
513 o 1:c7586e2a9264 added a |
514 | () [default] draft |
514 | () [default] draft |
515 o 0:8fa14d15e168 added hgignore |
515 o 0:8fa14d15e168 added hgignore |
516 () [default] draft |
516 () [default] draft |
517 |
517 |
518 $ hg evolve --content-divergent |
518 $ hg evolve --content-divergent |
519 merge:[19] added y |
519 merge:[23] added y |
520 with: [17] added y |
520 with: [20] added y |
521 base: [16] added y |
521 base: [18] added y |
522 rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e |
522 rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e |
523 updating to "local" side of the conflict: b4575ed6fcfc |
523 updating to "local" side of the conflict: b4575ed6fcfc |
524 merging "other" content-divergent changeset '48f745db3f53' |
524 merging "other" divergent changeset '48f745db3f53' |
525 merging y |
525 merging y |
526 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
526 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
527 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
527 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
528 fix conflicts and see `hg help evolve.interrupted` |
528 fix conflicts and see `hg help evolve.interrupted` |
529 [1] |
529 [1] |
534 continue: hg evolve --continue |
534 continue: hg evolve --continue |
535 $ hg evolve --continue |
535 $ hg evolve --continue |
536 working directory is now at 7bbcf24ddecf |
536 working directory is now at 7bbcf24ddecf |
537 |
537 |
538 $ hg glog |
538 $ hg glog |
539 @ 21:7bbcf24ddecf added y |
539 @ 25:7bbcf24ddecf added y |
540 | () [bar] draft |
540 | () [bar] draft |
541 o 15:b006cf317e0e added foo to x |
541 o 17:b006cf317e0e added foo to x |
542 | () [bar] draft |
542 | () [bar] draft |
543 o 10:4ae4427ee9f8 added d |
543 o 11:4ae4427ee9f8 added d |
544 | () [default] draft |
544 | () [default] draft |
545 o 9:917281f93fcb added c |
545 o 10:917281f93fcb added c |
546 | () [default] draft |
546 | () [default] draft |
547 o 8:171614c9a791 added b |
547 o 9:171614c9a791 added b |
548 | () [default] draft |
548 | () [default] draft |
549 o 1:c7586e2a9264 added a |
549 o 1:c7586e2a9264 added a |
550 | () [default] draft |
550 | () [default] draft |
551 o 0:8fa14d15e168 added hgignore |
551 o 0:8fa14d15e168 added hgignore |
552 () [default] draft |
552 () [default] draft |
553 |
553 |
554 $ hg obslog -r . --all |
554 $ hg obslog -r . --all |
555 @ 7bbcf24ddecf (21) added y |
555 @ 7bbcf24ddecf (25) added y |
556 |\ |
556 |\ |
557 x | 48f745db3f53 (20) added y |
557 x | 48f745db3f53 (24) added y |
558 | | rewritten(branch, content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
558 | | rewritten(branch, content) as 7bbcf24ddecf by test (Thu Jan 01 00:00:00 1970 +0000) |
559 | | |
559 | | |
560 | x b4575ed6fcfc (19) added y |
560 | x b4575ed6fcfc (23) added y |
561 | | rewritten(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
561 | | rewritten(content) as 7bbcf24ddecf by test (Thu Jan 01 00:00:00 1970 +0000) |
562 | | |
562 | | |
563 x | 2a9f6ccbdeba (17) added y |
563 x | 2a9f6ccbdeba (20) added y |
564 | | rewritten(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
564 | | rewritten(parent) as 48f745db3f53 by test (Thu Jan 01 00:00:00 1970 +0000) |
565 | | |
565 | | |
566 | x 96b677f01b81 (18) added y |
566 | x 96b677f01b81 (21) added y |
567 |/ rewritten(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
567 |/ rewritten(content) as b4575ed6fcfc by test (Thu Jan 01 00:00:00 1970 +0000) |
568 | |
568 | |
569 x fc6ad2bac162 (16) added y |
569 x fc6ad2bac162 (18) added y |
570 rewritten(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
570 rewritten(content) as 2a9f6ccbdeba by test (Thu Jan 01 00:00:00 1970 +0000) |
571 rewritten(branch, parent) as 96b677f01b81 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
571 rewritten(branch, parent) as 96b677f01b81 by test (Thu Jan 01 00:00:00 1970 +0000) |
572 |
572 |
573 |
573 |
574 checking that relocated commit is there |
574 checking that relocated commit is there |
575 $ hg exp 48f745db3f53 --hidden |
575 $ hg exp 48f745db3f53 --hidden |
576 # HG changeset patch |
576 # HG changeset patch |
622 |
622 |
623 $ hg up daf1de08f3b0 --hidden |
623 $ hg up daf1de08f3b0 --hidden |
624 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
624 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
625 working directory parent is obsolete! (daf1de08f3b0) |
625 working directory parent is obsolete! (daf1de08f3b0) |
626 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
626 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
627 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
627 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True |
628 rebasing 22:daf1de08f3b0 "added z" |
628 rebasing 26:daf1de08f3b0 "added z" |
629 2 new content-divergent changesets |
629 2 new divergent changesets |
630 $ echo bar > z |
630 $ echo bar > z |
631 $ hg amend |
631 $ hg amend |
632 |
632 |
633 $ hg glog |
633 $ hg glog |
634 @ 25:53242575ffa9 added z |
634 @ 31:53242575ffa9 added z |
635 | () [bar] draft |
635 | () [bar] draft |
636 | o 23:3f7a1f693080 added z |
636 | o 28:3f7a1f693080 added z |
637 | | () [default] draft |
637 | | () [default] draft |
638 o | 21:7bbcf24ddecf added y |
638 o | 25:7bbcf24ddecf added y |
639 | | () [bar] draft |
639 | | () [bar] draft |
640 o | 15:b006cf317e0e added foo to x |
640 o | 17:b006cf317e0e added foo to x |
641 | | () [bar] draft |
641 | | () [bar] draft |
642 o | 10:4ae4427ee9f8 added d |
642 o | 11:4ae4427ee9f8 added d |
643 | | () [default] draft |
643 | | () [default] draft |
644 o | 9:917281f93fcb added c |
644 o | 10:917281f93fcb added c |
645 |/ () [default] draft |
645 |/ () [default] draft |
646 o 8:171614c9a791 added b |
646 o 9:171614c9a791 added b |
647 | () [default] draft |
647 | () [default] draft |
648 o 1:c7586e2a9264 added a |
648 o 1:c7586e2a9264 added a |
649 | () [default] draft |
649 | () [default] draft |
650 o 0:8fa14d15e168 added hgignore |
650 o 0:8fa14d15e168 added hgignore |
651 () [default] draft |
651 () [default] draft |
652 |
652 |
653 $ hg evolve --content-divergent |
653 $ hg evolve --content-divergent |
654 merge:[25] added z |
654 merge:[31] added z |
655 with: [23] added z |
655 with: [28] added z |
656 base: [22] added z |
656 base: [26] added z |
657 rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf |
657 rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf |
658 merging y |
658 merging y |
659 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
659 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
660 fix conflicts and see `hg help evolve.interrupted` |
660 fix conflicts and see `hg help evolve.interrupted` |
661 [1] |
661 [1] |
680 $ hg resolve -m |
680 $ hg resolve -m |
681 (no more unresolved files) |
681 (no more unresolved files) |
682 continue: hg evolve --continue |
682 continue: hg evolve --continue |
683 |
683 |
684 $ hg evolve --continue |
684 $ hg evolve --continue |
685 evolving 23:3f7a1f693080 "added z" |
685 evolving 28:3f7a1f693080 "added z" |
686 updating to "local" side of the conflict: 53242575ffa9 |
686 updating to "local" side of the conflict: 53242575ffa9 |
687 merging "other" content-divergent changeset 'cdb0643c69fc' |
687 merging "other" divergent changeset 'cdb0643c69fc' |
688 merging y |
688 merging y |
689 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
689 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
690 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
690 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
691 fix conflicts and see `hg help evolve.interrupted` |
691 fix conflicts and see `hg help evolve.interrupted` |
692 [1] |
692 [1] |
708 continue: hg evolve --continue |
708 continue: hg evolve --continue |
709 $ hg evolve --continue |
709 $ hg evolve --continue |
710 working directory is now at 6fc7d9682de6 |
710 working directory is now at 6fc7d9682de6 |
711 |
711 |
712 $ hg glog |
712 $ hg glog |
713 @ 27:6fc7d9682de6 added z |
713 @ 33:6fc7d9682de6 added z |
714 | () [bar] draft |
714 | () [bar] draft |
715 o 21:7bbcf24ddecf added y |
715 o 25:7bbcf24ddecf added y |
716 | () [bar] draft |
716 | () [bar] draft |
717 o 15:b006cf317e0e added foo to x |
717 o 17:b006cf317e0e added foo to x |
718 | () [bar] draft |
718 | () [bar] draft |
719 o 10:4ae4427ee9f8 added d |
719 o 11:4ae4427ee9f8 added d |
720 | () [default] draft |
720 | () [default] draft |
721 o 9:917281f93fcb added c |
721 o 10:917281f93fcb added c |
722 | () [default] draft |
722 | () [default] draft |
723 o 8:171614c9a791 added b |
723 o 9:171614c9a791 added b |
724 | () [default] draft |
724 | () [default] draft |
725 o 1:c7586e2a9264 added a |
725 o 1:c7586e2a9264 added a |
726 | () [default] draft |
726 | () [default] draft |
727 o 0:8fa14d15e168 added hgignore |
727 o 0:8fa14d15e168 added hgignore |
728 () [default] draft |
728 () [default] draft |
799 |
798 |
800 $ hg up c7586e2a9264 |
799 $ hg up c7586e2a9264 |
801 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
800 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
802 $ echo bar > a |
801 $ echo bar > a |
803 $ hg amend -m "watbar to a" |
802 $ hg amend -m "watbar to a" |
804 3 new orphan changesets |
803 3 new unstable changesets |
805 $ echo wat > a |
804 $ echo wat > a |
806 $ hg amend -m "watbar to a" |
805 $ hg amend -m "watbar to a" |
|
806 $ hg evolve --all |
|
807 move:[2] added b |
|
808 atop:[8] watbar to a |
|
809 move:[3] added c |
|
810 move:[4] added d |
|
811 working directory is now at 15c781f93cac |
|
812 $ hg glog |
|
813 @ 11:15c781f93cac added d |
|
814 | () [default] draft |
|
815 o 10:9e5fb1d5b955 added c |
|
816 | () [default] draft |
|
817 o 9:88516dccf68a added b |
|
818 | () [default] draft |
|
819 o 8:82b74d5dc678 watbar to a |
|
820 | () [default] draft |
|
821 o 0:8fa14d15e168 added hgignore |
|
822 () [default] draft |
|
823 |
|
824 $ cd ../stacktest |
|
825 $ hg up .^^^ |
|
826 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
827 $ echo wat > a |
|
828 $ hg amend -m "watbar to a" |
|
829 3 new unstable changesets |
807 $ hg evolve --all |
830 $ hg evolve --all |
808 move:[2] added b |
831 move:[2] added b |
809 atop:[6] watbar to a |
832 atop:[6] watbar to a |
810 move:[3] added c |
833 move:[3] added c |
811 move:[4] added d |
834 move:[4] added d |
812 working directory is now at 15c781f93cac |
|
813 $ hg glog |
|
814 @ 9:15c781f93cac added d |
|
815 | () [default] draft |
|
816 o 8:9e5fb1d5b955 added c |
|
817 | () [default] draft |
|
818 o 7:88516dccf68a added b |
|
819 | () [default] draft |
|
820 o 6:82b74d5dc678 watbar to a |
|
821 | () [default] draft |
|
822 o 0:8fa14d15e168 added hgignore |
|
823 () [default] draft |
|
824 |
|
825 $ cd ../stacktest |
|
826 $ hg up .^^^ |
|
827 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
828 $ echo wat > a |
|
829 $ hg amend -m "watbar to a" |
|
830 3 new orphan changesets |
|
831 $ hg evolve --all |
|
832 move:[2] added b |
|
833 atop:[5] watbar to a |
|
834 move:[3] added c |
|
835 move:[4] added d |
|
836 working directory is now at c72d2885eb51 |
835 working directory is now at c72d2885eb51 |
837 $ hg glog |
836 $ hg glog |
838 @ 8:c72d2885eb51 added d |
837 @ 9:c72d2885eb51 added d |
839 | () [default] draft |
838 | () [default] draft |
840 o 7:3ce4be6d8e5e added c |
839 o 8:3ce4be6d8e5e added c |
841 | () [default] draft |
840 | () [default] draft |
842 o 6:d5f148423c16 added b |
841 o 7:d5f148423c16 added b |
843 | () [default] draft |
842 | () [default] draft |
844 o 5:8e222f257bbf watbar to a |
843 o 6:8e222f257bbf watbar to a |
845 | () [default] draft |
844 | () [default] draft |
846 o 0:8fa14d15e168 added hgignore |
845 o 0:8fa14d15e168 added hgignore |
847 () [default] draft |
846 () [default] draft |
848 |
847 |
849 $ hg pull ../stack2 |
848 $ hg pull ../stack2 |
851 searching for changes |
850 searching for changes |
852 adding changesets |
851 adding changesets |
853 adding manifests |
852 adding manifests |
854 adding file changes |
853 adding file changes |
855 added 4 changesets with 0 changes to 4 files (+1 heads) |
854 added 4 changesets with 0 changes to 4 files (+1 heads) |
856 5 new obsolescence markers |
855 7 new obsolescence markers |
857 new changesets 82b74d5dc678:15c781f93cac |
|
858 (run 'hg heads' to see heads, 'hg merge' to merge) |
856 (run 'hg heads' to see heads, 'hg merge' to merge) |
859 8 new content-divergent changesets |
857 8 new divergent changesets |
860 |
858 |
861 $ hg glog |
859 $ hg glog |
862 o 12:15c781f93cac added d |
860 o 13:15c781f93cac added d |
863 | () [default] draft |
861 | () [default] draft |
864 o 11:9e5fb1d5b955 added c |
862 o 12:9e5fb1d5b955 added c |
865 | () [default] draft |
863 | () [default] draft |
866 o 10:88516dccf68a added b |
864 o 11:88516dccf68a added b |
867 | () [default] draft |
865 | () [default] draft |
868 o 9:82b74d5dc678 watbar to a |
866 o 10:82b74d5dc678 watbar to a |
869 | () [default] draft |
867 | () [default] draft |
870 | @ 8:c72d2885eb51 added d |
868 | @ 9:c72d2885eb51 added d |
871 | | () [default] draft |
869 | | () [default] draft |
872 | o 7:3ce4be6d8e5e added c |
870 | o 8:3ce4be6d8e5e added c |
873 | | () [default] draft |
871 | | () [default] draft |
874 | o 6:d5f148423c16 added b |
872 | o 7:d5f148423c16 added b |
875 | | () [default] draft |
873 | | () [default] draft |
876 | o 5:8e222f257bbf watbar to a |
874 | o 6:8e222f257bbf watbar to a |
877 |/ () [default] draft |
875 |/ () [default] draft |
878 o 0:8fa14d15e168 added hgignore |
876 o 0:8fa14d15e168 added hgignore |
879 () [default] draft |
877 () [default] draft |
880 |
878 |
881 $ hg evolve --all --content-divergent |
879 $ hg evolve --all --content-divergent |
882 merge:[5] watbar to a |
880 merge:[6] watbar to a |
883 with: [9] watbar to a |
881 with: [10] watbar to a |
884 base: [1] added a |
882 base: [1] added a |
885 updating to "local" side of the conflict: 8e222f257bbf |
883 updating to "local" side of the conflict: 8e222f257bbf |
886 merging "other" content-divergent changeset '82b74d5dc678' |
884 merging "other" divergent changeset '82b74d5dc678' |
887 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
885 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
888 merge:[6] added b |
886 merge:[7] added b |
889 with: [10] added b |
887 with: [11] added b |
890 base: [2] added b |
888 base: [2] added b |
891 updating to "local" side of the conflict: d5f148423c16 |
889 updating to "local" side of the conflict: d5f148423c16 |
892 merging "other" content-divergent changeset '88516dccf68a' |
890 merging "other" divergent changeset '88516dccf68a' |
893 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
891 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
894 merge:[7] added c |
892 merge:[8] added c |
895 with: [11] added c |
893 with: [12] added c |
896 base: [3] added c |
894 base: [3] added c |
897 updating to "local" side of the conflict: 3ce4be6d8e5e |
895 updating to "local" side of the conflict: 3ce4be6d8e5e |
898 merging "other" content-divergent changeset '9e5fb1d5b955' |
896 merging "other" divergent changeset '9e5fb1d5b955' |
899 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
897 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
900 merge:[8] added d |
898 merge:[9] added d |
901 with: [12] added d |
899 with: [13] added d |
902 base: [4] added d |
900 base: [4] added d |
903 updating to "local" side of the conflict: c72d2885eb51 |
901 updating to "local" side of the conflict: c72d2885eb51 |
904 merging "other" content-divergent changeset '15c781f93cac' |
902 merging "other" divergent changeset '15c781f93cac' |
905 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
903 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
906 working directory is now at 038fe7db3d88 |
904 working directory is now at 038fe7db3d88 |
907 |
905 |
908 $ hg glog |
906 $ hg glog |
909 @ 16:038fe7db3d88 added d |
907 @ 17:038fe7db3d88 added d |
910 | () [default] draft |
908 | () [default] draft |
911 o 15:b2cac10f3836 added c |
909 o 16:b2cac10f3836 added c |
912 | () [default] draft |
910 | () [default] draft |
913 o 14:eadfd9d70680 added b |
911 o 15:eadfd9d70680 added b |
914 | () [default] draft |
912 | () [default] draft |
915 o 13:f66f262fff6c watbar to a |
913 o 14:f66f262fff6c watbar to a |
916 | () [default] draft |
914 | () [default] draft |
917 o 0:8fa14d15e168 added hgignore |
915 o 0:8fa14d15e168 added hgignore |
918 () [default] draft |
916 () [default] draft |