This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4544

rebase: add tests showing patch conflict detection needs to be smarter in IMM
ClosedPublic

Authored by pulkit on Sep 12 2018, 10:55 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGaa022f8873ea: rebase: add tests showing patch conflict detection needs to be smarter in IMM
Summary

This patch adds test which shows that you can't rebase a cset which removes a
dir and adds a file of the same as that of dir as there are False positives
path conflicts reported.

I fixed the case when there is a file and we adds a dir of same name while
removing the file, but missed testing the current case. Next patch will fix
this.

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.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-inmemory.t (42 lines)

Diff 10951

tests/test-rebase-inmemory.t

| o 1: fc055c3b4d33 'b' | o 1: fc055c3b4d33 'b'
|/ |/
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
$ hg rebase -r . -d 2 $ hg rebase -r . -d 2
rebasing 4:daf7dfc139cb "a/a" (tip) rebasing 4:daf7dfc139cb "a/a" (tip)
saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg
$ hg tglog
@ 4: c6ad37a4f250 'a/a'
|
| o 3: 844a7de3e617 'c'
| |
o | 2: 09c044d2cb43 'd'
| |
o | 1: fc055c3b4d33 'b'
|/
o 0: b173517d0057 'a'
$ echo foo > foo
$ hg ci -Aqm "added foo"
$ hg up '.^'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo bar > bar
$ hg ci -Aqm "added bar"
$ hg rm a/a
$ echo a > a
$ hg ci -Aqm "added a back!"
$ hg tglog
@ 7: 855e9797387e 'added a back!'
|
o 6: d14530e5e3e6 'added bar'
|
| o 5: 9b94b9373deb 'added foo'
|/
o 4: c6ad37a4f250 'a/a'
|
| o 3: 844a7de3e617 'c'
| |
o | 2: 09c044d2cb43 'd'
| |
o | 1: fc055c3b4d33 'b'
|/
o 0: b173517d0057 'a'
$ hg rebase -r . -d 5
rebasing 7:855e9797387e "added a back!" (tip)
abort: error: file 'a' cannot be written because 'a/' is a folder in 9b94b9373deb (containing 1 entries: a/a)
[255]
$ cd .. $ cd ..
Test dry-run rebasing Test dry-run rebasing
$ hg init repo3 $ hg init repo3
$ cd repo3 $ cd repo3
$ echo a>a $ echo a>a
$ hg ci -Aqma $ hg ci -Aqma