Mercurial > evolve

comparison tests/test-evolve-content-divergent-relocation.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 59b2be90e9fd
children 6dbfd71cdcba
comparison
equal deleted inserted replaced
5713:c3c870f3b98e 5714:b3d9e6c805d6
308 merging y 308 merging y
309 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') 309 warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
310 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 310 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
311 unresolved merge conflicts 311 unresolved merge conflicts
312 (see 'hg help evolve.interrupted') 312 (see 'hg help evolve.interrupted')
313 [1] 313 [240]
314 314
315 $ echo watbar > y 315 $ echo watbar > y
316 $ hg resolve -m 316 $ hg resolve -m
317 (no more unresolved files) 317 (no more unresolved files)
318 continue: hg evolve --continue 318 continue: hg evolve --continue
462 rebasing "divergent" content-divergent changeset 9bc2ace42175 on 7411ed2cf7cf 462 rebasing "divergent" content-divergent changeset 9bc2ace42175 on 7411ed2cf7cf
463 merging y 463 merging y
464 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') 464 warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
465 unresolved merge conflicts 465 unresolved merge conflicts
466 (see 'hg help evolve.interrupted') 466 (see 'hg help evolve.interrupted')
467 [1] 467 [240]
468 468
469 $ hg diff 469 $ hg diff
470 diff -r 7411ed2cf7cf y 470 diff -r 7411ed2cf7cf y
471 --- a/y Thu Jan 01 00:00:00 1970 +0000 471 --- a/y Thu Jan 01 00:00:00 1970 +0000
472 +++ b/y Thu Jan 01 00:00:00 1970 +0000 472 +++ b/y Thu Jan 01 00:00:00 1970 +0000
492 merging y 492 merging y
493 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') 493 warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
494 1 files updated, 0 files merged, 0 files removed, 1 files unresolved 494 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
495 unresolved merge conflicts 495 unresolved merge conflicts
496 (see 'hg help evolve.interrupted') 496 (see 'hg help evolve.interrupted')
497 [1] 497 [240]
498 498
499 $ hg diff 499 $ hg diff
500 diff -r 635c0edd2e45 y 500 diff -r 635c0edd2e45 y
501 --- a/y Thu Jan 01 00:00:00 1970 +0000 501 --- a/y Thu Jan 01 00:00:00 1970 +0000
502 +++ b/y Thu Jan 01 00:00:00 1970 +0000 502 +++ b/y Thu Jan 01 00:00:00 1970 +0000