mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 09:48:05 +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
90 lines
2.2 KiB
Perl
90 lines
2.2 KiB
Perl
Test update logic when there are renames or weird same-name cases between dirs
|
|
and files
|
|
|
|
Update with local changes across a file rename
|
|
|
|
$ hg init r1 && cd r1
|
|
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg ci -m a
|
|
|
|
$ hg mv a b
|
|
$ hg ci -m rename
|
|
|
|
$ echo b > b
|
|
$ hg ci -m change
|
|
|
|
$ hg up -q 0
|
|
|
|
$ echo c > a
|
|
|
|
$ hg up
|
|
merging a and b to b
|
|
warning: 1 conflicts while merging b! (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
|
|
[1]
|
|
|
|
Test update when local untracked directory exists with the same name as a
|
|
tracked file in a commit we are updating to
|
|
$ hg init r2 && cd r2
|
|
$ echo root > root && hg ci -Am root # rev 0
|
|
adding root
|
|
$ echo text > name && hg ci -Am "name is a file" # rev 1
|
|
adding name
|
|
$ hg up 0
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ mkdir name
|
|
$ hg up 1
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Test update when local untracked directory exists with some files in it and has
|
|
the same name a tracked file in a commit we are updating to. In future this
|
|
should be updated to give an friendlier error message, but now we should just
|
|
make sure that this does not erase untracked data
|
|
$ hg up 0
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ mkdir name
|
|
$ echo text > name/file
|
|
$ hg st
|
|
? name/file
|
|
$ hg up 1
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd ..
|
|
|
|
#if symlink
|
|
|
|
Test update when two commits have symlinks that point to different folders
|
|
$ hg init r3 && cd r3
|
|
$ echo root > root && hg ci -Am root
|
|
adding root
|
|
$ mkdir folder1 && mkdir folder2
|
|
$ ln -s folder1 folder
|
|
$ hg ci -Am "symlink to folder1"
|
|
adding folder
|
|
$ rm folder
|
|
$ ln -s folder2 folder
|
|
$ hg ci -Am "symlink to folder2"
|
|
$ hg up 1
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd ..
|
|
|
|
#endif
|
|
|
|
#if rmcwd
|
|
|
|
Test that warning is printed if cwd is deleted during update
|
|
$ hg init r4 && cd r4
|
|
$ mkdir dir
|
|
$ cd dir
|
|
$ echo a > a
|
|
$ echo b > b
|
|
$ hg add a b
|
|
$ hg ci -m "file and dir"
|
|
$ hg up -q null
|
|
current directory was removed
|
|
(consider changing to repo root: $TESTTMP/r1/r4)
|
|
|
|
#endif
|