Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 39132:873f3a56993f
context: make sure file is not deleted while checking path conflicts
If a file is deleted and a directory of same name is created in the same commit,
IMM thinks of that as a file conflict, however the file is deleted and hence the
directory can be created.
The test change demonstrate the fix.
Differential Revision: https://phab.mercurial-scm.org/D4300
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Thu, 16 Aug 2018 16:59:40 +0300 |
| parents | 02e80e37fbbc |
| children | e338a921a0cd |
comparison
equal
deleted
inserted
replaced
| 39131:02e80e37fbbc | 39132:873f3a56993f |
|---|---|
| 175 |/ | 175 |/ |
| 176 o 0: b173517d0057 'a' | 176 o 0: b173517d0057 'a' |
| 177 | 177 |
| 178 $ hg rebase -r . -d 2 | 178 $ hg rebase -r . -d 2 |
| 179 rebasing 4:daf7dfc139cb "a/a" (tip) | 179 rebasing 4:daf7dfc139cb "a/a" (tip) |
| 180 abort: error: 'a/a' conflicts with file 'a' in 2. | 180 saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg |
| 181 [255] | |
| 182 | 181 |
| 183 $ cd .. | 182 $ cd .. |
| 184 | 183 |
| 185 Test dry-run rebasing | 184 Test dry-run rebasing |
| 186 | 185 |