mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +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
57 lines
1.5 KiB
Perl
57 lines
1.5 KiB
Perl
Test that checks that relative paths are used in merge
|
|
|
|
$ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ mkdir dir && echo a > dir/file
|
|
$ hg ci -Aqm first
|
|
|
|
$ hg up -q null
|
|
$ mkdir dir && echo b > dir/file
|
|
$ hg ci -Aqm second
|
|
|
|
$ hg up -q 0
|
|
|
|
$ hg merge 1
|
|
merging dir/file
|
|
warning: 1 conflicts while merging dir/file! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
$ hg up -q -C .
|
|
$ cd dir
|
|
$ hg merge 1
|
|
merging file
|
|
warning: 1 conflicts while merging file! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
Merging with different paths
|
|
$ cd ..
|
|
$ rm -rf repo
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ mkdir dir && echo a > dir/file
|
|
$ hg ci -Aqm common
|
|
$ echo b > dir/file
|
|
$ hg commit -Am modify
|
|
|
|
$ hg up -q 0
|
|
$ mkdir dir2
|
|
$ hg mv dir/file dir2/file
|
|
$ hg ci -Aqm move
|
|
$ hg merge 1
|
|
merging dir2/file and dir/file to dir2/file
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg up -q -C .
|
|
$ cd dir2
|
|
$ hg merge 1
|
|
merging file and ../dir/file to file
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|