Mercurial > hg
diff hgext/histedit.py @ 19393:33e1b2d4bdbc
Merge histedit fixes from stable.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Tue, 16 Jul 2013 11:13:18 -0500 |
parents | 59cdd3a7e281 f6b047cf9272 |
children | 10a0ae668fe6 |
line wrap: on
line diff
--- a/hgext/histedit.py Sat Jun 29 14:27:53 2013 +0400 +++ b/hgext/histedit.py Tue Jul 16 11:13:18 2013 -0500 @@ -247,7 +247,7 @@ files.update(ctx.files()) # Recompute copies (avoid recording a -> b -> a) - copied = copies.pathcopies(first, last) + copied = copies.pathcopies(base, last) # prune files which were reverted by the updates def samefile(f):