D4299: tests: demonstrate that IMM needs to be smarter with path conflicts
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Thu Aug 16 12:48:16 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG02e80e37fbbc: tests: demonstrate that IMM needs to be smarter with path conflicts (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4299?vs=10389&id=10393
REVISION DETAIL
https://phab.mercurial-scm.org/D4299
AFFECTED FILES
tests/test-rebase-inmemory.t
CHANGE DETAILS
diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -155,6 +155,30 @@
| o 1: fc055c3b4d33 'b'
|/
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 ..
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list