Mercurial > evolve

comparison tests/test-evolve-public-content-divergent-main.t @ 4676:b6c819facbe8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolvecmd: the proper way to deal with conflicts is to resolve them And it's worth making the suggestion an actual hint.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 06 Jun 2019 17:37:42 +0800
parents b62ed7c69561
children ecf0f3bc7468 1f92a6aa40d6
comparison
equal deleted inserted replaced
4669:daab6d665687 4676:b6c819facbe8
168 with: [3] updated b 168 with: [3] updated b
169 base: [1] added b 169 base: [1] added b
170 merging b 170 merging b
171 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 171 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
172 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 172 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
173 fix conflicts and see `hg help evolve.interrupted` 173 unresolved merge conflicts
174 (see 'hg help evolve.interrupted')
174 [1] 175 [1]
175 176
176 $ echo "I am foobar" > b 177 $ echo "I am foobar" > b
177 $ hg resolve -m --tool union 178 $ hg resolve -m --tool union
178 (no more unresolved files) 179 (no more unresolved files)
354 with: [4] added d c e 355 with: [4] added d c e
355 base: [3] added d 356 base: [3] added d
356 rebasing "other" content-divergent changeset f31bcc378766 on 155349b645be 357 rebasing "other" content-divergent changeset f31bcc378766 on 155349b645be
357 merging c 358 merging c
358 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 359 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
359 fix conflicts and see `hg help evolve.interrupted` 360 unresolved merge conflicts
361 (see 'hg help evolve.interrupted')
360 [1] 362 [1]
361 363
362 $ hg diff 364 $ hg diff
363 diff -r 155349b645be c 365 diff -r 155349b645be c
364 --- a/c Thu Jan 01 00:00:00 1970 +0000 366 --- a/c Thu Jan 01 00:00:00 1970 +0000
484 base: [3] added d 486 base: [3] added d
485 rebasing "other" content-divergent changeset 9411ad1fe615 on 155349b645be 487 rebasing "other" content-divergent changeset 9411ad1fe615 on 155349b645be
486 merging d 488 merging d
487 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 489 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
488 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 490 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
489 fix conflicts and see `hg help evolve.interrupted` 491 unresolved merge conflicts
492 (see 'hg help evolve.interrupted')
490 [1] 493 [1]
491 494
492 $ echo d > d 495 $ echo d > d
493 $ hg res -m 496 $ hg res -m
494 (no more unresolved files) 497 (no more unresolved files)
576 with: [4] added c e 579 with: [4] added c e
577 base: [3] added d 580 base: [3] added d
578 rebasing "other" content-divergent changeset 3c17c7afaf6e on 155349b645be 581 rebasing "other" content-divergent changeset 3c17c7afaf6e on 155349b645be
579 merging c 582 merging c
580 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 583 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
581 fix conflicts and see `hg help evolve.interrupted` 584 unresolved merge conflicts
585 (see 'hg help evolve.interrupted')
582 [1] 586 [1]
583 587
584 $ hg diff 588 $ hg diff
585 diff -r 155349b645be c 589 diff -r 155349b645be c
586 --- a/c Thu Jan 01 00:00:00 1970 +0000 590 --- a/c Thu Jan 01 00:00:00 1970 +0000
610 $ hg evolve --continue 614 $ hg evolve --continue
611 evolving 4:3c17c7afaf6e "added c e" 615 evolving 4:3c17c7afaf6e "added c e"
612 merging d 616 merging d
613 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 617 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
614 2 files updated, 0 files merged, 0 files removed, 1 files unresolved 618 2 files updated, 0 files merged, 0 files removed, 1 files unresolved
615 fix conflicts and see `hg help evolve.interrupted` 619 unresolved merge conflicts
620 (see 'hg help evolve.interrupted')
616 [1] 621 [1]
617 622
618 $ echo d > d 623 $ echo d > d
619 $ hg res -m 624 $ hg res -m
620 (no more unresolved files) 625 (no more unresolved files)