Mercurial > evolve

comparison tests/test-evolve-public-content-divergent-discard.t @ 5892:34cd08a46b6d mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 24 Apr 2021 20:01:39 +0800
parents 8e4f6354b316
children c0921b5277a0
comparison
equal deleted inserted replaced
5891:b13cb2d500ae 5892:34cd08a46b6d
271 merging ch 271 merging ch
272 warning: conflicts while merging ch! (edit, then use 'hg resolve --mark') 272 warning: conflicts while merging ch! (edit, then use 'hg resolve --mark')
273 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 273 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
274 unresolved merge conflicts 274 unresolved merge conflicts
275 (see 'hg help evolve.interrupted') 275 (see 'hg help evolve.interrupted')
276 [240] 276 [1]
277 277
278 $ hg diff 278 $ hg diff
279 diff -r f7c1071f1e7c ch 279 diff -r f7c1071f1e7c ch
280 --- a/ch Thu Jan 01 00:00:00 1970 +0000 280 --- a/ch Thu Jan 01 00:00:00 1970 +0000
281 +++ b/ch Thu Jan 01 00:00:00 1970 +0000 281 +++ b/ch Thu Jan 01 00:00:00 1970 +0000
385 rebasing "divergent" content-divergent changeset f89a8e2f86ac on 155349b645be 385 rebasing "divergent" content-divergent changeset f89a8e2f86ac on 155349b645be
386 merging c 386 merging c
387 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 387 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
388 unresolved merge conflicts 388 unresolved merge conflicts
389 (see 'hg help evolve.interrupted') 389 (see 'hg help evolve.interrupted')
390 [240] 390 [1]
391 391
392 $ echo c > c 392 $ echo c > c
393 $ hg res -m 393 $ hg res -m
394 (no more unresolved files) 394 (no more unresolved files)
395 continue: hg evolve --continue 395 continue: hg evolve --continue
490 merging dh 490 merging dh
491 warning: conflicts while merging dh! (edit, then use 'hg resolve --mark') 491 warning: conflicts while merging dh! (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 [240] 495 [1]
496 496
497 $ echo dh > dh 497 $ echo dh > dh
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
593 rebasing "divergent" content-divergent changeset 67b19bbd770f on 155349b645be 593 rebasing "divergent" content-divergent changeset 67b19bbd770f on 155349b645be
594 merging c 594 merging c
595 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 595 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
596 unresolved merge conflicts 596 unresolved merge conflicts
597 (see 'hg help evolve.interrupted') 597 (see 'hg help evolve.interrupted')
598 [240] 598 [1]
599 599
600 $ echo c > c 600 $ echo c > c
601 $ hg res -m 601 $ hg res -m
602 (no more unresolved files) 602 (no more unresolved files)
603 continue: hg evolve --continue 603 continue: hg evolve --continue
607 merging dh 607 merging dh
608 warning: conflicts while merging dh! (edit, then use 'hg resolve --mark') 608 warning: conflicts while merging dh! (edit, then use 'hg resolve --mark')
609 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 609 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
610 unresolved merge conflicts 610 unresolved merge conflicts
611 (see 'hg help evolve.interrupted') 611 (see 'hg help evolve.interrupted')
612 [240] 612 [1]
613 613
614 $ echo dh > dh 614 $ echo dh > dh
615 $ hg res -m 615 $ hg res -m
616 (no more unresolved files) 616 (no more unresolved files)
617 continue: hg evolve --continue 617 continue: hg evolve --continue