This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4340

tests: show that merging with sparse is broken when rename is involved
ClosedPublic

Authored by pulkit on Aug 21 2018, 9:21 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGc6eb2118f44f: tests: show that merging with sparse is broken when rename is involved
Summary

This patch adds test to show that merging with sparse is broken when you have a
rename on one side and just modification on another side.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Aug 21 2018, 9:21 AM
pulkit updated this revision to Diff 10876.Sep 11 2018, 8:15 AM
martinvonz accepted this revision.Sep 11 2018, 12:37 PM
This revision is now accepted and ready to land.Sep 11 2018, 12:37 PM
Closed by commit rHGc6eb2118f44f: tests: show that merging with sparse is broken when rename is involved (authored by pulkit). · Explain WhySep 11 2018, 1:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-sparse-merges.t (64 lines)

Diff 10883

tests/test-sparse-merges.t

$ hg merge $ hg merge
temporarily included 1 file(s) in the sparse checkout for merging temporarily included 1 file(s) in the sparse checkout for merging
file 'd' was deleted in other [merge rev] but was modified in local [working copy]. file 'd' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ cd ..
Testing merging of a file which is renamed+modified on one side and modified on
another
$ hg init mvtest
$ cd mvtest
$ echo "syntax: glob" >> .hgignore
$ echo "*.orig" >> .hgignore
$ hg ci -Aqm "added .hgignore"
$ for ch in a d; do echo foo > $ch; hg ci -Aqm "added "$ch; done;
$ cat >> .hg/hgrc <<EOF
> [alias]
> glog = log -GT "{rev}:{node|short} {desc}"
> [extensions]
> sparse =
> EOF
$ hg glog
@ 2:f29feff37cfc added d
|
o 1:617125d27d6b added a
|
o 0:53f3774ed939 added .hgignore
$ echo babar >> a
$ hg ci -m "added babar to a"
$ hg up '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv a amove
$ hg ci -m "moved a to amove"
created new head
$ hg up 3
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg glog
o 4:5d1e85955f6d moved a to amove
|
| @ 3:a06e41a6c16c added babar to a
|/
o 2:f29feff37cfc added d
|
o 1:617125d27d6b added a
|
o 0:53f3774ed939 added .hgignore
$ hg debugsparse --exclude "a"
$ ls
d
$ hg merge
abort: $ENOENT$: $TESTTMP/mvtest/a
[255]
$ hg up -C 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge
merging amove and a to amove
abort: cannot add 'a' - it is outside the sparse checkout
(include file with `hg debugsparse --include <pattern>` or use `hg add -s <file>` to include file directory while adding)
[255]