Show More
@@ -2159,7 +2159,9 class overlayworkingctx(committablectx): | |||||
2159 | # the file is marked as existing. |
|
2159 | # the file is marked as existing. | |
2160 | if exists and data is None: |
|
2160 | if exists and data is None: | |
2161 | oldentry = self._cache.get(path) or {} |
|
2161 | oldentry = self._cache.get(path) or {} | |
2162 |
data = oldentry.get('data') |
|
2162 | data = oldentry.get('data') | |
|
2163 | if data is None: | |||
|
2164 | data = self._wrappedctx[path].data() | |||
2163 |
|
2165 | |||
2164 | self._cache[path] = { |
|
2166 | self._cache[path] = { | |
2165 | 'exists': exists, |
|
2167 | 'exists': exists, |
@@ -795,12 +795,10 Test rebasing a commit with copy informa | |||||
795 | $ hg co -q 0 |
|
795 | $ hg co -q 0 | |
796 | $ hg mv a b |
|
796 | $ hg mv a b | |
797 | $ hg ci -qm 'rename a to b' |
|
797 | $ hg ci -qm 'rename a to b' | |
798 | BROKEN: shouldn't crash |
|
|||
799 | $ hg rebase -d 1 |
|
798 | $ hg rebase -d 1 | |
800 | rebasing 2:b977edf6f839 "rename a to b" (tip) |
|
799 | rebasing 2:b977edf6f839 "rename a to b" (tip) | |
801 | merging a and b to b |
|
800 | merging a and b to b | |
802 | abort: b@c71e275f666f: not found in manifest! |
|
801 | saved backup bundle to $TESTTMP/rebase-rename-empty/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg | |
803 | [255] |
|
|||
804 | $ hg st --copies --change . |
|
802 | $ hg st --copies --change . | |
805 | A b |
|
803 | A b | |
806 | a |
|
804 | a |
General Comments 0
You need to be logged in to leave comments.
Login now