Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-inmemory.t @ 40803:44c2e80db985 stable
rebase: fix dir/file conflict detection when using in-mem merge
Differential Revision: https://phab.mercurial-scm.org/D5360
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 03 Dec 2018 11:14:44 -0800 |
| parents | e204d9a27528 |
| children | 9b1d5eea07f9 |
line wrap: on
line diff
--- a/tests/test-rebase-inmemory.t Mon Dec 03 11:11:34 2018 -0800 +++ b/tests/test-rebase-inmemory.t Mon Dec 03 11:14:44 2018 -0800 @@ -243,12 +243,16 @@ $ echo c > c/c $ hg add c/c $ hg ci -m 'c/c' -BROKEN: This should be a conflict, should not crash - $ hg rebase -r . -d 3 -n 2>&1 | grep KeyError - KeyError: 'c' -BROKEN: This should be a conflict, should not crash - $ hg rebase -r 3 -d . -n 2>&1 | grep KeyError - KeyError: 'c/c' + $ hg rebase -r . -d 3 -n + starting dry-run rebase; repository will not be changed + rebasing 8:755f0104af9b "c/c" (tip) + abort: error: 'c/c' conflicts with file 'c' in 3. + [255] + $ hg rebase -r 3 -d . -n + starting dry-run rebase; repository will not be changed + rebasing 3:844a7de3e617 "c" + abort: error: file 'c' cannot be written because 'c/' is a folder in 755f0104af9b (containing 1 entries: c/c) + [255] $ cd ..