changeset 3161 | 1839e6e91c3a |
parent 3157 | 56c59ba7aa76 |
child 3162 | 84561ea8711e |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -133,6 +133,10 @@ def findcopies(repo, m1, m2, limit): Find moves and copies between m1 and m2 back to limit linkrev """ + # avoid silly behavior for update from empty dir + if not m1: + return {} + dcopies = repo.dirstate.copies() copy = {} match = {}