Mercurial > evolve

comparison tests/test-evolve-public-content-divergent-main.t @ 5714:b3d9e6c805d6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update with more detailed exit codes CORE-TEST-OUTPUT-UPDATE: 21733e8c924f CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0 CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c CORE-TEST-OUTPUT-UPDATE: ebee234d952a CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60 CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b CORE-TEST-OUTPUT-UPDATE: f96fa4de5055 CORE-TEST-OUTPUT-UPDATE: 96ca817ec192
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 19 Nov 2020 08:28:45 -0800
parents 6eb9f82b43ba
children 61d2f1cf90f0
comparison
equal deleted inserted replaced
5713:c3c870f3b98e 5714:b3d9e6c805d6
172 merging b 172 merging b
173 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 173 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
174 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 174 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
175 unresolved merge conflicts 175 unresolved merge conflicts
176 (see 'hg help evolve.interrupted') 176 (see 'hg help evolve.interrupted')
177 [1] 177 [240]
178 178
179 $ echo "I am foobar" > b 179 $ echo "I am foobar" > b
180 $ hg resolve -m --tool union 180 $ hg resolve -m --tool union
181 (no more unresolved files) 181 (no more unresolved files)
182 continue: hg evolve --continue 182 continue: hg evolve --continue
359 rebasing "divergent" content-divergent changeset f31bcc378766 on 155349b645be 359 rebasing "divergent" content-divergent changeset f31bcc378766 on 155349b645be
360 merging c 360 merging c
361 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 361 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
362 unresolved merge conflicts 362 unresolved merge conflicts
363 (see 'hg help evolve.interrupted') 363 (see 'hg help evolve.interrupted')
364 [1] 364 [240]
365 365
366 $ hg diff 366 $ hg diff
367 diff -r 155349b645be c 367 diff -r 155349b645be c
368 --- a/c Thu Jan 01 00:00:00 1970 +0000 368 --- a/c Thu Jan 01 00:00:00 1970 +0000
369 +++ b/c Thu Jan 01 00:00:00 1970 +0000 369 +++ b/c Thu Jan 01 00:00:00 1970 +0000
490 merging d 490 merging d
491 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 491 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
492 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 492 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
493 unresolved merge conflicts 493 unresolved merge conflicts
494 (see 'hg help evolve.interrupted') 494 (see 'hg help evolve.interrupted')
495 [1] 495 [240]
496 496
497 $ echo d > d 497 $ echo d > d
498 $ hg res -m 498 $ hg res -m
499 (no more unresolved files) 499 (no more unresolved files)
500 continue: hg evolve --continue 500 continue: hg evolve --continue
582 rebasing "divergent" content-divergent changeset 3c17c7afaf6e on 155349b645be 582 rebasing "divergent" content-divergent changeset 3c17c7afaf6e on 155349b645be
583 merging c 583 merging c
584 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 584 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
585 unresolved merge conflicts 585 unresolved merge conflicts
586 (see 'hg help evolve.interrupted') 586 (see 'hg help evolve.interrupted')
587 [1] 587 [240]
588 588
589 $ hg diff 589 $ hg diff
590 diff -r 155349b645be c 590 diff -r 155349b645be c
591 --- a/c Thu Jan 01 00:00:00 1970 +0000 591 --- a/c Thu Jan 01 00:00:00 1970 +0000
592 +++ b/c Thu Jan 01 00:00:00 1970 +0000 592 +++ b/c Thu Jan 01 00:00:00 1970 +0000
617 merging d 617 merging d
618 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 618 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
619 2 files updated, 0 files merged, 0 files removed, 1 files unresolved 619 2 files updated, 0 files merged, 0 files removed, 1 files unresolved
620 unresolved merge conflicts 620 unresolved merge conflicts
621 (see 'hg help evolve.interrupted') 621 (see 'hg help evolve.interrupted')
622 [1] 622 [240]
623 623
624 $ echo d > d 624 $ echo d > d
625 $ hg res -m 625 $ hg res -m
626 (no more unresolved files) 626 (no more unresolved files)
627 continue: hg evolve --continue 627 continue: hg evolve --continue