Show More
@@ -1773,7 +1773,6 b' class workingfilectx(committablefilectx)' | |||
|
1773 | 1773 | |
|
1774 | 1774 | def markcopied(self, src): |
|
1775 | 1775 | """marks this file a copy of `src`""" |
|
1776 | if self._repo.dirstate[self._path] in "nma": | |
|
1777 | 1776 |
|
|
1778 | 1777 | |
|
1779 | 1778 | def clearunknown(self): |
@@ -798,4 +798,5 b' def duplicatecopies(repo, wctx, rev, fro' | |||
|
798 | 798 | for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems(): |
|
799 | 799 | if dst in exclude: |
|
800 | 800 | continue |
|
801 | if dst in wctx: | |
|
801 | 802 | wctx[dst].markcopied(src) |
@@ -795,12 +795,10 b' Rebase across a copy with --collapse' | |||
|
795 | 795 | $ hg co -q 0 |
|
796 | 796 | $ echo a2 > a |
|
797 | 797 | $ hg ci -qm 'modify a' |
|
798 | BROKEN: obviously... | |
|
799 | 798 | $ hg rebase -r . -d 1 --collapse |
|
800 | 799 | rebasing 2:41c4ea50d4cf "modify a" (tip) |
|
801 | 800 | merging b and a to b |
|
802 | abort: a@b977edf6f839: not found in manifest! | |
|
803 | [255] | |
|
801 | saved backup bundle to $TESTTMP/rebase-rename-collapse/.hg/strip-backup/41c4ea50d4cf-b90b7994-rebase.hg | |
|
804 | 802 | $ cd .. |
|
805 | 803 | |
|
806 | 804 | 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