Show More
@@ -1913,7 +1913,7 b' class overlayworkingctx(committablectx):' | |||||
1913 | if self.isdirty(path): |
|
1913 | if self.isdirty(path): | |
1914 | return self._cache[path]['copied'] |
|
1914 | return self._cache[path]['copied'] | |
1915 | else: |
|
1915 | else: | |
1916 | raise error.ProgrammingError('copydata() called on clean context') |
|
1916 | return None | |
1917 |
|
1917 | |||
1918 | def flags(self, path): |
|
1918 | def flags(self, path): | |
1919 | if self.isdirty(path): |
|
1919 | if self.isdirty(path): |
@@ -774,8 +774,14 b' Test rebasing a commit with copy informa' | |||||
774 | $ hg co -q 0 |
|
774 | $ hg co -q 0 | |
775 | $ hg mv a b |
|
775 | $ hg mv a b | |
776 | $ hg ci -qm 'rename a to b' |
|
776 | $ hg ci -qm 'rename a to b' | |
777 | $ hg rebase -d 1 2>&1 | grep '** ProgrammingError' |
|
777 | $ hg rebase -d 1 | |
778 | ** ProgrammingError: copydata() called on clean context |
|
778 | rebasing 2:b977edf6f839 "rename a to b" (tip) | |
|
779 | merging a and b to b | |||
|
780 | saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg | |||
|
781 | $ hg st --copies --change . | |||
|
782 | A b | |||
|
783 | a | |||
|
784 | R a | |||
779 | $ cd .. |
|
785 | $ cd .. | |
780 |
|
786 | |||
781 | Test rebasing when the file we are merging in destination is empty |
|
787 | Test rebasing when the file we are merging in destination is empty |
General Comments 0
You need to be logged in to leave comments.
Login now