This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3983

sparse: add test showing `hg merge` is broken while using sparse extension
ClosedPublic

Authored by pulkit on Jul 27 2018, 8:38 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG91c405f84cf7: sparse: add test showing `hg merge` is broken while using sparse extension
Summary

This patch adds a test to demonstrate that hg merge is broken in some cases
while using sparse extension.

The case is when you have a file which is:

  • modified between current wdir parent and merge base
  • deleted between merge base and merge destination
  • excluded from sparse checkout

Doing hg merge results in file not found error. Next patch will fix this.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Jul 27 2018, 8:38 AM
pulkit added a comment.Jul 27 2018, 8:41 AM

I feel like these two patches are appropriate for stable because this is a bugfix, so I propose them for stable.

Closed by commit rHG91c405f84cf7: sparse: add test showing `hg merge` is broken while using sparse extension (authored by pulkit). · Explain WhyJul 31 2018, 9:21 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 9667

tests/test-sparse-merges.t

$ hg ci -Aqm 'add branchonly' $ hg ci -Aqm 'add branchonly'
$ hg up -q default $ hg up -q default
$ hg debugsparse -X branchonly $ hg debugsparse -X branchonly
$ hg merge feature $ hg merge feature
temporarily included 2 file(s) in the sparse checkout for merging temporarily included 2 file(s) in the sparse checkout for merging
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 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)
$ cd ..
Tests merging a file which is modified in one branch and deleted in another and
file is excluded from sparse checkout
$ hg init ytest
$ cd ytest
$ 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
$ hg rm d
$ hg ci -m "removed d"
$ hg up '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg debugsparse --reset
$ echo bar >> d
$ hg ci -Am "added bar to d"
created new head
$ hg glog
@ 4:6527874a90e4 added bar to d
|
| o 3:372c8558de45 removed d
|/
o 2:f29feff37cfc added d
|
o 1:617125d27d6b added a
|
o 0:53f3774ed939 added .hgignore
$ hg debugsparse --exclude "d"
$ ls
a
$ hg merge
abort: $ENOENT$: '$TESTTMP/ytest/d'
[255]