Mercurial > hg
view tests/test-merge-types.t @ 16536:63c817ea4a70 stable
commit: abort on merge with missing files
Here is a script illustrating the previous behaviour:
The merge brings a new file 'b' from remote
$ hg merge 1 --debug
searching for copies back to rev 1
unmatched files in other:
b
resolving manifests
overwrite: False, partial: False
ancestor: 07f494440405, local: 540395c44225+, remote: 102a90ea7b4a
b: remote created -> g
updating: b 1/1 files (100.00%)
getting b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Delete but do not remove b
$ rm b
$ hg st
! b
The commit succeeds
$ hg commit -m merge
$ hg parents --template "{rev} {desc|firstline} files: {files}\n"
3 merge files:
$ hg st
! b
b changes were ignored, but even b existence was ignored
$ hg manifest
a
This happens because localrepo.commitctx() checks the input ctx.files(), which
is empty for workingctx.files() only returns added, modified or removed
entries, and bypass files/manifest updates completely. So the committed
revision manifest is the same as its first parent one, not containing the 'b'
file.
This patch forces the commit to abort in presence of a merge and missing files.
test-merge4.t is modified accordingly as it was introduced to check hg was not
just terminating with a traceback (5e9e8b8d2629).
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Sat, 28 Apr 2012 15:01:57 +0200 |
parents | cb1475e7e5a2 |
children | 722fd97f6645 |
line wrap: on
line source
$ "$TESTDIR/hghave" symlink execbit || exit 80 $ hg init $ echo a > a $ hg ci -Amadd adding a $ chmod +x a $ hg ci -mexecutable $ hg up 0 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ rm a $ ln -s symlink a $ hg ci -msymlink created new head $ hg merge --debug searching for copies back to rev 1 resolving manifests overwrite: False, partial: False ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: update permissions -> e updating: a 1/1 files (100.00%) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) Symlink is local parent, executable is other: $ if [ -h a ]; then > echo a is a symlink > $TESTDIR/readlink.py a > elif [ -x a ]; then > echo a is executable > else > echo "a has no flags (default for conflicts)" > fi a has no flags (default for conflicts) $ hg update -C 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge --debug searching for copies back to rev 1 resolving manifests overwrite: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: remote is newer -> g updating: a 1/1 files (100.00%) getting a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) Symlink is other parent, executable is local: $ if [ -h a ]; then > echo a is a symlink > $TESTDIR/readlink.py a > elif [ -x a ]; then > echo a is executable > else > echo "a has no flags (default for conflicts)" > fi a has no flags (default for conflicts) Update to link without local change should get us a symlink (issue3316): $ hg up -C 0 $ hg up $ hg st Update to link with local change should cause a merge prompt (issue3200): $ hg up -C 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo data > a $ HGMERGE= hg up -y --debug searching for copies back to rev 2 resolving manifests overwrite: False, partial: False ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f a: versions differ -> m preserving a for resolve of a updating: a 1/1 files (100.00%) (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) picked tool 'internal:prompt' for a (binary False symlink True) no tool found to merge a keep (l)ocal or take (o)ther? l 0 files updated, 1 files merged, 0 files removed, 0 files unresolved $ hg diff --git diff --git a/a b/a old mode 120000 new mode 100644 --- a/a +++ b/a @@ -1,1 +1,1 @@ -symlink \ No newline at end of file +data