mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
3e592b81ae
Summary: When you get an error, let's print the number of conflicts in each file. This will give the user some sense of how much work they have to do. The code change is entirely in `filemerge.py`, and `tests/test-merge-conflict-count.t` adds a new test. Reviewed By: quark-zju Differential Revision: D9815243 fbshipit-source-id: 1b73a1db293902ac7242997a7d6ae09478344068
96 lines
1.7 KiB
Perl
96 lines
1.7 KiB
Perl
$ . helpers-usechg.sh
|
|
|
|
test that we don't interrupt the merge session if
|
|
a file-level merge failed
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ echo foo > foo
|
|
$ echo a > bar
|
|
$ hg ci -Am 'add foo'
|
|
adding bar
|
|
adding foo
|
|
|
|
$ hg mv foo baz
|
|
$ echo b >> bar
|
|
$ echo quux > quux1
|
|
$ hg ci -Am 'mv foo baz'
|
|
adding quux1
|
|
|
|
$ hg up -qC 0
|
|
$ echo >> foo
|
|
$ echo c >> bar
|
|
$ echo quux > quux2
|
|
$ hg ci -Am 'change foo'
|
|
adding quux2
|
|
|
|
test with the rename on the remote side
|
|
$ HGMERGE=false hg merge
|
|
merging bar
|
|
merging foo and baz to baz
|
|
merging bar failed!
|
|
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
$ hg resolve -l
|
|
U bar
|
|
R baz
|
|
|
|
test with the rename on the local side
|
|
$ hg up -C 1
|
|
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ HGMERGE=false hg merge
|
|
merging bar
|
|
merging baz and foo to baz
|
|
merging bar failed!
|
|
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
show unresolved
|
|
$ hg resolve -l
|
|
U bar
|
|
R baz
|
|
|
|
unmark baz
|
|
$ hg resolve -u baz
|
|
|
|
show
|
|
$ hg resolve -l
|
|
U bar
|
|
U baz
|
|
$ hg st
|
|
M bar
|
|
M baz
|
|
M quux2
|
|
? bar.orig
|
|
|
|
re-resolve baz
|
|
$ hg resolve baz
|
|
merging baz and foo to baz
|
|
|
|
after resolve
|
|
$ hg resolve -l
|
|
U bar
|
|
R baz
|
|
|
|
resolve all warning
|
|
$ hg resolve
|
|
abort: no files or directories specified
|
|
(use --all to re-merge all unresolved files)
|
|
[255]
|
|
|
|
resolve all
|
|
$ hg resolve -a
|
|
merging bar
|
|
warning: 1 conflicts while merging bar! (edit, then use 'hg resolve --mark')
|
|
[1]
|
|
|
|
after
|
|
$ hg resolve -l
|
|
U bar
|
|
R baz
|
|
|
|
$ cd ..
|