Show More
@@ -1896,7 +1896,7 b' class overlayworkingctx(committablectx):' | |||||
1896 | components = path.split('/') |
|
1896 | components = path.split('/') | |
1897 | for i in pycompat.xrange(len(components)): |
|
1897 | for i in pycompat.xrange(len(components)): | |
1898 | component = "/".join(components[0:i]) |
|
1898 | component = "/".join(components[0:i]) | |
1899 | if component in self.p1(): |
|
1899 | if component in self.p1() and self._cache[component]['exists']: | |
1900 | fail(path, component) |
|
1900 | fail(path, component) | |
1901 |
|
1901 | |||
1902 | # Test the other direction -- that this path from p2 isn't a directory |
|
1902 | # Test the other direction -- that this path from p2 isn't a directory |
@@ -177,8 +177,7 b' Test reporting of path conflicts' | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now