Mercurial > evolve

comparison tests/test-evolve-public-content-divergent-corner-cases.t @ 5666:e5d91fd1f319

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 c2fab88e6d60
children 8e4f6354b316 b0b1ab64f6d8
comparison
equal deleted inserted replaced
5665:dd9dba7c1d00 5666:e5d91fd1f319
394 rebasing "divergent" content-divergent changeset e568fd1029bb on 155349b645be 394 rebasing "divergent" content-divergent changeset e568fd1029bb on 155349b645be
395 merging c 395 merging c
396 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 396 warning: conflicts while merging c! (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 [240]
400 400
401 $ hg diff 401 $ hg diff
402 diff -r 155349b645be c 402 diff -r 155349b645be c
403 --- a/c Thu Jan 01 00:00:00 1970 +0000 403 --- a/c Thu Jan 01 00:00:00 1970 +0000
404 +++ b/c Thu Jan 01 00:00:00 1970 +0000 404 +++ b/c Thu Jan 01 00:00:00 1970 +0000
425 You can use (c)hanged version, (d)elete, or leave (u)nresolved. 425 You can use (c)hanged version, (d)elete, or leave (u)nresolved.
426 What do you want to do? u 426 What do you want to do? u
427 1 files updated, 0 files merged, 0 files removed, 1 files unresolved 427 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
428 unresolved merge conflicts 428 unresolved merge conflicts
429 (see 'hg help evolve.interrupted') 429 (see 'hg help evolve.interrupted')
430 [1] 430 [240]
431 431
432 $ hg sum 432 $ hg sum
433 parent: 5:93cd84bbdaca 433 parent: 5:93cd84bbdaca
434 added d 434 added d
435 parent: 6:2af3359250d3 tip (content-divergent) 435 parent: 6:2af3359250d3 tip (content-divergent)