This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4299

tests: demonstrate that IMM needs to be smarter with path conflicts
ClosedPublic

Authored by pulkit on Aug 16 2018, 10:07 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG02e80e37fbbc: tests: demonstrate that IMM needs to be smarter with path conflicts
Summary

When we try to rebase a commit which deletes an existing file and make a
directory of the same name, rebase with IMM aborts. It should work fine just
like the without IMM case.

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 (24 lines)

Diff 10393

tests/test-rebase-inmemory.t

$ hg tglog $ hg tglog
@ 3: 844a7de3e617 'c' @ 3: 844a7de3e617 'c'
| |
| o 2: 09c044d2cb43 'd' | o 2: 09c044d2cb43 'd'
| | | |
| o 1: fc055c3b4d33 'b' | o 1: fc055c3b4d33 'b'
|/ |/
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
Test reporting of path conflicts
$ hg rm a
$ mkdir a
$ touch a/a
$ hg ci -Am "a/a"
adding a/a
$ hg tglog
@ 4: daf7dfc139cb 'a/a'
|
o 3: 844a7de3e617 'c'
|
| o 2: 09c044d2cb43 'd'
| |
| o 1: fc055c3b4d33 'b'
|/
o 0: b173517d0057 'a'
$ hg rebase -r . -d 2
rebasing 4:daf7dfc139cb "a/a" (tip)
abort: error: 'a/a' conflicts with file 'a' in 2.
[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