Mercurial > hgsubversion
diff hgsubversion/editor.py @ 585:c3ba4ca81d16
editor: fix replaced files content in replay mode
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Tue, 02 Mar 2010 17:06:06 +0100 |
parents | 44c56a7727c4 |
children | 704d2ce1d906 |
line wrap: on
line diff
--- a/hgsubversion/editor.py +++ b/hgsubversion/editor.py @@ -209,8 +209,11 @@ class HgEditor(delta.Editor): if not from_file: self.current.missing.add(path) return + # Use exact=True because during replacements ('R' action) we select + # replacing branch as parent, but svn delta editor provides delta + # agains replaced branch. ha = self.meta.get_parent_revision(copyfrom_revision + 1, - from_branch) + from_branch, True) ctx = self.repo.changectx(ha) if from_file in ctx: fctx = ctx.filectx(from_file)