( )⚙ D6330 tests: add test where copy source is deleted and added back

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6330

tests: add test where copy source is deleted and added back
ClosedPublic

Authored by martinvonz on Apr 29 2019, 6:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc83c08cf02b7: tests: add test where copy source is deleted and added back
Summary

This shows another difference between pathcopies() and mergecopies():
mergecopies() considers files that have been deleted and then added
back as different files, but pathcopies() does not.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mtests/test-rename-merge1.t (49 lines)

Diff 14963

tests/test-rename-merge1.t

newfile newfile
newfile: remote created -> g newfile: remote created -> g
getting newfile getting newfile
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg status $ hg status
M newfile M newfile
$ cd .. $ cd ..
Check that file is considered unrelated when deleted and recreated
$ hg init unrelated
$ cd unrelated
$ echo foo > file
$ hg add file
$ hg commit -m "added file"
$ hg cp file newfile
$ hg commit -m "copy file"
$ hg update 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg rm file
$ hg commit -m "deleted file"
created new head
$ echo bar > file
$ hg add file
$ hg ci -m 'recreate file'
$ hg log -G -T '{rev} {desc}\n'
@ 3 recreate file
|
o 2 deleted file
|
| o 1 copy file
|/
o 0 added file
BROKEN: this is inconsistent with `hg merge` (below), which doesn't consider
'file' renamed same since it was deleted for a while
$ hg st --copies --rev 3 --rev 1
M file
A newfile
file
$ hg merge --debug 1
unmatched files in other:
newfile
all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'file' -> dst: 'newfile'
checking for directory renames
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 19d7f95df299, local: 4e4a42b1cbdf+, remote: 45b14aae7432
newfile: remote created -> g
getting newfile
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg status
M newfile
$ cd ..