Mercurial > evolve

comparison tests/test-evolve-content-divergent-stack.t @ 5304:83ceafbaa7d6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge into stable in preparation for release
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 May 2020 18:22:26 +0800
parents e8660b28bfee
children 011b53a9d03c a8c21707e9c4
comparison
equal deleted inserted replaced
5252:a828c7a7ace1 5304:83ceafbaa7d6
146 base: [1] added a 146 base: [1] added a
147 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 147 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
148 merge:[6] added b 148 merge:[6] added b
149 with: [10] added b 149 with: [10] added b
150 base: [2] added b 150 base: [2] added b
151 rebasing "divergent" content-divergent changeset d5f148423c16 on f66f262fff6c 151 rebasing "divergent" content-divergent changeset d5f148423c16 on df93a529fa42
152 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 152 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
153 merge:[7] added c 153 merge:[7] added c
154 with: [11] added c 154 with: [11] added c
155 base: [3] added c 155 base: [3] added c
156 rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on eadfd9d70680 156 rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on 365f419742a3
157 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 157 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
158 merge:[8] added d 158 merge:[8] added d
159 with: [12] added d 159 with: [12] added d
160 base: [4] added d 160 base: [4] added d
161 rebasing "divergent" content-divergent changeset c72d2885eb51 on b2cac10f3836 161 rebasing "divergent" content-divergent changeset c72d2885eb51 on a18171c7d9e7
162 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 162 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
163 working directory is now at f66f262fff6c 163 working directory is now at df93a529fa42
164 164
165 $ hg glog 165 $ hg glog
166 o 19:038fe7db3d88 added d 166 o 19:59d49942cf47 added d
167 | () [default] draft 167 | () [default] draft
168 o 17:b2cac10f3836 added c 168 o 17:a18171c7d9e7 added c
169 | () [default] draft 169 | () [default] draft
170 o 15:eadfd9d70680 added b 170 o 15:365f419742a3 added b
171 | () [default] draft 171 | () [default] draft
172 @ 13:f66f262fff6c watbar to a 172 @ 13:df93a529fa42 watbar to a
173 | () [default] draft 173 | () [default] draft
174 o 0:8fa14d15e168 added hgignore 174 o 0:8fa14d15e168 added hgignore
175 () [default] draft 175 () [default] draft
176 Resolving content-divergence of a stack with different parents 176 Resolving content-divergence of a stack with different parents
177 --------------------------------------------------------- 177 ---------------------------------------------------------
317 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514 317 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
318 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 318 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
319 merge:[11] added b 319 merge:[11] added b
320 with: [6] added b 320 with: [6] added b
321 base: [2] added b 321 base: [2] added b
322 rebasing "divergent" content-divergent changeset 6eb54b5af3fb on 74fbf3e6a0b6 322 rebasing "divergent" content-divergent changeset 6eb54b5af3fb on ebb749d2ace8
323 rebasing "other" content-divergent changeset d5f148423c16 on 74fbf3e6a0b6 323 rebasing "other" content-divergent changeset d5f148423c16 on ebb749d2ace8
324 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 324 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
325 merge:[12] added c 325 merge:[12] added c
326 with: [7] added c 326 with: [7] added c
327 base: [3] added c 327 base: [3] added c
328 rebasing "divergent" content-divergent changeset 8ed612937375 on 4e29776e83a5 328 rebasing "divergent" content-divergent changeset 8ed612937375 on 9437917ebe8d
329 rebasing "other" content-divergent changeset 3ce4be6d8e5e on 4e29776e83a5 329 rebasing "other" content-divergent changeset 3ce4be6d8e5e on 9437917ebe8d
330 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 330 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
331 merge:[13] added d 331 merge:[13] added d
332 with: [8] added d 332 with: [8] added d
333 base: [4] added d 333 base: [4] added d
334 rebasing "divergent" content-divergent changeset d45f050514c2 on 77126af93a25 334 rebasing "divergent" content-divergent changeset d45f050514c2 on 8e574c12775a
335 rebasing "other" content-divergent changeset c72d2885eb51 on 77126af93a25 335 rebasing "other" content-divergent changeset c72d2885eb51 on 8e574c12775a
336 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 336 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
337 working directory is now at 74fbf3e6a0b6 337 working directory is now at ebb749d2ace8
338 338
339 $ hg glog 339 $ hg glog
340 o 24:c8f73c376a6e added d 340 o 24:5ab9b88fbead added d
341 | () [default] draft 341 | () [default] draft
342 o 21:77126af93a25 added c 342 o 21:8e574c12775a added c
343 | () [default] draft 343 | () [default] draft
344 o 18:4e29776e83a5 added b 344 o 18:9437917ebe8d added b
345 | () [default] draft 345 | () [default] draft
346 @ 15:74fbf3e6a0b6 watbar to a 346 @ 15:ebb749d2ace8 watbar to a
347 | () [default] draft 347 | () [default] draft
348 o 9:2228e3b74514 add newfile 348 o 9:2228e3b74514 add newfile
349 | () [default] draft 349 | () [default] draft
350 o 0:8fa14d15e168 added hgignore 350 o 0:8fa14d15e168 added hgignore
351 () [default] draft 351 () [default] draft
353 when "divergent" and "other" both hit merge conflict in relocating 353 when "divergent" and "other" both hit merge conflict in relocating
354 ------------------------------------------------------------------ 354 ------------------------------------------------------------------
355 355
356 $ hg strip 14: --hidden 356 $ hg strip 14: --hidden
357 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 357 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
358 saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/74fbf3e6a0b6-f3612603-backup.hg 358 saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/ebb749d2ace8-0585ef5a-backup.hg
359 8 new content-divergent changesets 359 8 new content-divergent changesets
360 360
361 Prepare repo to have merge conflicts 361 Prepare repo to have merge conflicts
362 $ hg up -r "max(desc('added a'))" 362 $ hg up -r "max(desc('added a'))"
363 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 363 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
366 with: [5] watbar to a 366 with: [5] watbar to a
367 base: [1] added a 367 base: [1] added a
368 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514 368 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
369 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 369 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
370 6 new orphan changesets 370 6 new orphan changesets
371 working directory is now at 74fbf3e6a0b6 371 working directory is now at ebb749d2ace8
372 $ echo b_conflict > b 372 $ echo b_conflict > b
373 $ hg amend -A 373 $ hg amend -A
374 adding b 374 adding b
375 375
376 Let's try to evolve stack 376 Let's try to evolve stack
377 $ hg evolve --content-divergent 377 $ hg evolve --content-divergent
378 merge:[11] added b 378 merge:[11] added b
379 with: [6] added b 379 with: [6] added b
380 base: [2] added b 380 base: [2] added b
381 rebasing "divergent" content-divergent changeset 6eb54b5af3fb on 119989a4317e 381 rebasing "divergent" content-divergent changeset 6eb54b5af3fb on 73a960350ce9
382 merging b 382 merging b
383 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 383 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
384 unresolved merge conflicts 384 unresolved merge conflicts
385 (see 'hg help evolve.interrupted') 385 (see 'hg help evolve.interrupted')
386 [1] 386 [1]
389 $ hg res -m 389 $ hg res -m
390 (no more unresolved files) 390 (no more unresolved files)
391 continue: hg evolve --continue 391 continue: hg evolve --continue
392 $ hg evolve --continue 392 $ hg evolve --continue
393 evolving 11:6eb54b5af3fb "added b" 393 evolving 11:6eb54b5af3fb "added b"
394 rebasing "other" content-divergent changeset d5f148423c16 on 119989a4317e 394 rebasing "other" content-divergent changeset d5f148423c16 on 73a960350ce9
395 merging b 395 merging b
396 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 396 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
397 unresolved merge conflicts 397 unresolved merge conflicts
398 (see 'hg help evolve.interrupted') 398 (see 'hg help evolve.interrupted')
399 [1] 399 [1]
406 evolving 6:d5f148423c16 "added b" 406 evolving 6:d5f148423c16 "added b"
407 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 407 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
408 merge:[12] added c 408 merge:[12] added c
409 with: [7] added c 409 with: [7] added c
410 base: [3] added c 410 base: [3] added c
411 rebasing "divergent" content-divergent changeset 8ed612937375 on 646bd3372ee7 411 rebasing "divergent" content-divergent changeset 8ed612937375 on 1b637ec00f24
412 rebasing "other" content-divergent changeset 3ce4be6d8e5e on 646bd3372ee7 412 rebasing "other" content-divergent changeset 3ce4be6d8e5e on 1b637ec00f24
413 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 413 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
414 merge:[13] added d 414 merge:[13] added d
415 with: [8] added d 415 with: [8] added d
416 base: [4] added d 416 base: [4] added d
417 rebasing "divergent" content-divergent changeset d45f050514c2 on 67abc597e636 417 rebasing "divergent" content-divergent changeset d45f050514c2 on fbfadbe143d8
418 rebasing "other" content-divergent changeset c72d2885eb51 on 67abc597e636 418 rebasing "other" content-divergent changeset c72d2885eb51 on fbfadbe143d8
419 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 419 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
420 working directory is now at 119989a4317e 420 working directory is now at 73a960350ce9
421 $ hg glog 421 $ hg glog
422 o 25:5e2572194f59 added d 422 o 25:bf2836f524a3 added d
423 | () [default] draft 423 | () [default] draft
424 o 22:67abc597e636 added c 424 o 22:fbfadbe143d8 added c
425 | () [default] draft 425 | () [default] draft
426 o 19:646bd3372ee7 added b 426 o 19:1b637ec00f24 added b
427 | () [default] draft 427 | () [default] draft
428 @ 16:119989a4317e watbar to a 428 @ 16:73a960350ce9 watbar to a
429 | () [default] draft 429 | () [default] draft
430 o 9:2228e3b74514 add newfile 430 o 9:2228e3b74514 add newfile
431 | () [default] draft 431 | () [default] draft
432 o 0:8fa14d15e168 added hgignore 432 o 0:8fa14d15e168 added hgignore
433 () [default] draft 433 () [default] draft
434 434
435 when relocating "other" hit merge conflict but not "divergent" 435 when relocating "other" hit merge conflict but not "divergent"
436 -------------------------------------------------------------- 436 --------------------------------------------------------------
437 $ hg strip 14: --hidden 437 $ hg strip 14: --hidden
438 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 438 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
439 saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/74fbf3e6a0b6-15474722-backup.hg 439 saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/ebb749d2ace8-c2c1e937-backup.hg
440 8 new content-divergent changesets 440 8 new content-divergent changesets
441 441
442 Insert conflicting changes in between the stack of content-div csets 442 Insert conflicting changes in between the stack of content-div csets
443 $ hg up -r "max(desc('added b'))" 443 $ hg up -r "max(desc('added b'))"
444 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 444 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
475 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514 475 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
476 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 476 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
477 merge:[14] added b 477 merge:[14] added b
478 with: [17] added b 478 with: [17] added b
479 base: [2] added b 479 base: [2] added b
480 rebasing "divergent" content-divergent changeset 2a955e808c53 on 74fbf3e6a0b6 480 rebasing "divergent" content-divergent changeset 2a955e808c53 on ebb749d2ace8
481 rebasing "other" content-divergent changeset 509103439e5e on 74fbf3e6a0b6 481 rebasing "other" content-divergent changeset 509103439e5e on ebb749d2ace8
482 merging b 482 merging b
483 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 483 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
484 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 484 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
485 4 new orphan changesets 485 4 new orphan changesets
486 unresolved merge conflicts 486 unresolved merge conflicts
576 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514 576 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
577 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 577 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
578 merge:[14] added b 578 merge:[14] added b
579 with: [17] added b 579 with: [17] added b
580 base: [2] added b 580 base: [2] added b
581 rebasing "divergent" content-divergent changeset 2a955e808c53 on 74fbf3e6a0b6 581 rebasing "divergent" content-divergent changeset 2a955e808c53 on ebb749d2ace8
582 rebasing "other" content-divergent changeset 509103439e5e on 74fbf3e6a0b6 582 rebasing "other" content-divergent changeset 509103439e5e on ebb749d2ace8
583 merging b 583 merging b
584 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 584 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
585 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 585 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
586 4 new orphan changesets 586 4 new orphan changesets
587 unresolved merge conflicts 587 unresolved merge conflicts
591 $ hg evolve --stop 591 $ hg evolve --stop
592 2 new orphan changesets 592 2 new orphan changesets
593 stopped the interrupted evolve 593 stopped the interrupted evolve
594 working directory is now at 2a955e808c53 594 working directory is now at 2a955e808c53
595 $ hg log -G 595 $ hg log -G
596 o changeset: 21:74fbf3e6a0b6 596 o changeset: 21:ebb749d2ace8
597 | tag: tip 597 | tag: tip
598 | parent: 9:2228e3b74514 598 | parent: 9:2228e3b74514
599 | user: test 599 | user: test
600 | date: Thu Jan 01 00:00:00 1970 +0000 600 | date: Thu Jan 01 00:00:00 1970 +0000
601 | summary: watbar to a 601 | summary: watbar to a
639 | | | summary: added b 639 | | | summary: added b
640 | | | 640 | | |
641 +---x changeset: 10:c04ff147ef79 641 +---x changeset: 10:c04ff147ef79
642 | | user: test 642 | | user: test
643 | | date: Thu Jan 01 00:00:00 1970 +0000 643 | | date: Thu Jan 01 00:00:00 1970 +0000
644 | | obsolete: rewritten using evolve as 21:74fbf3e6a0b6 644 | | obsolete: rewritten using evolve as 21:ebb749d2ace8
645 | | summary: added a 645 | | summary: added a
646 | | 646 | |
647 o | changeset: 9:2228e3b74514 647 o | changeset: 9:2228e3b74514
648 | | parent: 0:8fa14d15e168 648 | | parent: 0:8fa14d15e168
649 | | user: test 649 | | user: test
652 | | 652 | |
653 | x changeset: 5:8e222f257bbf 653 | x changeset: 5:8e222f257bbf
654 |/ parent: 0:8fa14d15e168 654 |/ parent: 0:8fa14d15e168
655 | user: test 655 | user: test
656 | date: Thu Jan 01 00:00:00 1970 +0000 656 | date: Thu Jan 01 00:00:00 1970 +0000
657 | obsolete: rebased using evolve as 21:74fbf3e6a0b6 657 | obsolete: rebased using evolve as 21:ebb749d2ace8
658 | summary: watbar to a 658 | summary: watbar to a
659 | 659 |
660 o changeset: 0:8fa14d15e168 660 o changeset: 0:8fa14d15e168
661 user: test 661 user: test
662 date: Thu Jan 01 00:00:00 1970 +0000 662 date: Thu Jan 01 00:00:00 1970 +0000
663 summary: added hgignore 663 summary: added hgignore
664 664
665 $ hg obslog -r 'desc("watbar to a")' --all 665 $ hg obslog -r 'desc("watbar to a")' --all
666 o 74fbf3e6a0b6 (21) watbar to a 666 o ebb749d2ace8 (21) watbar to a
667 |\ 667 |\ rewritten from 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
668 | | rewritten(description, content) from c04ff147ef79 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
669 | |
668 x | 186bdc2cdfa2 (20) watbar to a 670 x | 186bdc2cdfa2 (20) watbar to a
669 | | rewritten as 74fbf3e6a0b6 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 671 | | rebased(parent) from 8e222f257bbf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
670 | | 672 | |
671 | x c04ff147ef79 (10) added a 673 | x c04ff147ef79 (10) added a
672 | | rewritten(description, content) as 74fbf3e6a0b6 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 674 | | rebased(parent) from c7586e2a9264 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
673 | | 675 | |
674 x | 8e222f257bbf (5) watbar to a 676 x | 8e222f257bbf (5) watbar to a
675 |/ rebased(parent) as 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 677 |/ rewritten(description, content) from c7586e2a9264 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
676 | 678 |
677 x c7586e2a9264 (1) added a 679 x c7586e2a9264 (1) added a
678 rewritten(description, content) as 8e222f257bbf using amend by test (Thu Jan 01 00:00:00 1970 +0000)
679 rebased(parent) as c04ff147ef79 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
680 680
681 $ hg obslog -r 'desc("added b")' --all 681 $ hg obslog -r 'desc("added b")' --all
682 @ 2a955e808c53 (14) added b 682 @ 2a955e808c53 (14) added b
683 | amended(content) from 6eb54b5af3fb using amend by test (Thu Jan 01 00:00:00 1970 +0000)
683 | 684 |
684 | * 509103439e5e (17) added b 685 | * 509103439e5e (17) added b
686 | | amended(content) from d5f148423c16 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
685 | | 687 | |
686 x | 6eb54b5af3fb (11) added b 688 x | 6eb54b5af3fb (11) added b
687 | | amended(content) as 2a955e808c53 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 689 | | rebased(parent) from b1661037fa25 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
688 | | 690 | |
689 | x d5f148423c16 (6) added b 691 | x d5f148423c16 (6) added b
690 |/ amended(content) as 509103439e5e using amend by test (Thu Jan 01 00:00:00 1970 +0000) 692 |/ rebased(parent) from b1661037fa25 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
691 | 693 |
692 x b1661037fa25 (2) added b 694 x b1661037fa25 (2) added b
693 rebased(parent) as 6eb54b5af3fb using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
694 rebased(parent) as d5f148423c16 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
695 695
696 696
697 Again, let's evolve the stack 697 Again, let's evolve the stack
698 $ hg evolve --content-divergent 698 $ hg evolve --content-divergent
699 merge:[14] added b 699 merge:[14] added b
700 with: [17] added b 700 with: [17] added b
701 base: [2] added b 701 base: [2] added b
702 rebasing "divergent" content-divergent changeset 2a955e808c53 on 74fbf3e6a0b6 702 rebasing "divergent" content-divergent changeset 2a955e808c53 on ebb749d2ace8
703 rebasing "other" content-divergent changeset 509103439e5e on 74fbf3e6a0b6 703 rebasing "other" content-divergent changeset 509103439e5e on ebb749d2ace8
704 merging b 704 merging b
705 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 705 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
706 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 706 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
707 unresolved merge conflicts 707 unresolved merge conflicts
708 (see 'hg help evolve.interrupted') 708 (see 'hg help evolve.interrupted')
714 continue: hg evolve --continue 714 continue: hg evolve --continue
715 $ hg evolve --continue 715 $ hg evolve --continue
716 merge:[15] added c 716 merge:[15] added c
717 with: [18] added c 717 with: [18] added c
718 base: [3] added c 718 base: [3] added c
719 rebasing "divergent" content-divergent changeset 48b0f803817a on 4e29776e83a5 719 rebasing "divergent" content-divergent changeset 48b0f803817a on 32bceb5bc91e
720 rebasing "other" content-divergent changeset eaf34afe4df3 on 4e29776e83a5 720 rebasing "other" content-divergent changeset eaf34afe4df3 on 32bceb5bc91e
721 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 721 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
722 merge:[16] added d 722 merge:[16] added d
723 with: [19] added d 723 with: [19] added d
724 base: [4] added d 724 base: [4] added d
725 rebasing "divergent" content-divergent changeset 91c8ccb9c241 on 77126af93a25 725 rebasing "divergent" content-divergent changeset 91c8ccb9c241 on a87eb9f90df6
726 rebasing "other" content-divergent changeset c351be27f199 on 77126af93a25 726 rebasing "other" content-divergent changeset c351be27f199 on a87eb9f90df6
727 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 727 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
728 working directory is now at 4e29776e83a5 728 working directory is now at 32bceb5bc91e
729 729
730 $ hg evolve -l 730 $ hg evolve -l
731 731
732 $ cd .. 732 $ cd ..
733 733
858 rebasing "other" content-divergent changeset 5b2d00df9c4e on 980f7dc84c29 858 rebasing "other" content-divergent changeset 5b2d00df9c4e on 980f7dc84c29
859 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 859 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
860 merge:[7] c 860 merge:[7] c
861 with: [4] c 861 with: [4] c
862 base: [2] c 862 base: [2] c
863 rebasing "divergent" content-divergent changeset ef4885dea3da on 0999c349998d 863 rebasing "divergent" content-divergent changeset ef4885dea3da on 6813d99f0a9d
864 rebasing "other" content-divergent changeset fef59171875e on 0999c349998d 864 rebasing "other" content-divergent changeset fef59171875e on 6813d99f0a9d
865 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 865 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
866 866
867 Expected result: 867 Expected result:
868 Changeset with description "b" only adds file "b" with content "b without typo". 868 Changeset with description "b" only adds file "b" with content "b without typo".
869 Changeset with description "c" only adds file "c" with content "c". 869 Changeset with description "c" only adds file "c" with content "c".
870 870
871 $ hg glog -l2 -p 871 $ hg glog -l2 -p
872 o 12:4ca627f76da9 c 872 o 12:d5a8159e883f c
873 | () [default] draftdiff -r 0999c349998d -r 4ca627f76da9 c 873 | () [default] draftdiff -r 6813d99f0a9d -r d5a8159e883f c
874 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 874 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000
875 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 875 | +++ b/c Thu Jan 01 00:00:00 1970 +0000
876 | @@ -0,0 +1,1 @@ 876 | @@ -0,0 +1,1 @@
877 | +c 877 | +c
878 | 878 |
879 o 9:0999c349998d b 879 o 9:6813d99f0a9d b
880 | () [default] draftdiff -r 980f7dc84c29 -r 0999c349998d b 880 | () [default] draftdiff -r 980f7dc84c29 -r 6813d99f0a9d b
881 ~ --- /dev/null Thu Jan 01 00:00:00 1970 +0000 881 ~ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
882 +++ b/b Thu Jan 01 00:00:00 1970 +0000 882 +++ b/b Thu Jan 01 00:00:00 1970 +0000
883 @@ -0,0 +1,1 @@ 883 @@ -0,0 +1,1 @@
884 +b without typo 884 +b without typo
885 885
961 rebasing "other" content-divergent changeset 8a2d93492f59 on 9703820a7d5b 961 rebasing "other" content-divergent changeset 8a2d93492f59 on 9703820a7d5b
962 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 962 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
963 merge:[9] added bar and car 963 merge:[9] added bar and car
964 with: [5] added bar and car 964 with: [5] added bar and car
965 base: [2] added bar and car 965 base: [2] added bar and car
966 rebasing "divergent" content-divergent changeset 7dd5b9d42ef3 on 8ef6ad88580d 966 rebasing "divergent" content-divergent changeset 7dd5b9d42ef3 on 586526ab82c5
967 rebasing "other" content-divergent changeset f4ed107810a7 on 8ef6ad88580d 967 rebasing "other" content-divergent changeset f4ed107810a7 on 586526ab82c5
968 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 968 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
969 2 new orphan changesets 969 2 new orphan changesets
970 working directory is now at 8ef6ad88580d 970 working directory is now at 586526ab82c5
971 971
972 $ hg glog 972 $ hg glog
973 o 15:09ba686a465e added bar and car 973 o 15:e905bb19fd7e added bar and car
974 | () [default] draft 974 | () [default] draft
975 @ 12:8ef6ad88580d added foo 975 @ 12:586526ab82c5 added foo
976 | () [default] draft 976 | () [default] draft
977 | * 10:9a1f460df8b5 added dar 977 | * 10:9a1f460df8b5 added dar
978 | | () [default] draft 978 | | () [default] draft
979 | x 9:7dd5b9d42ef3 added bar and car 979 | x 9:7dd5b9d42ef3 added bar and car
980 | | () [default] draft 980 | | () [default] draft