changeset 7186 | f77c8d8331ca |
parent 7153 | 353141d74ca8 |
child 7198 | df79ee9b6278 |
--- a/mercurial/patch.py Mon Oct 20 14:52:58 2008 +0200 +++ b/mercurial/patch.py Mon Oct 20 14:57:04 2008 +0200 @@ -783,13 +783,13 @@ yield l def scangitpatch(lr, firstline): - """ + """ Git patches can emit: - rename a to b - change b - copy a to c - change c - + We cannot apply this sequence as-is, the renamed 'a' could not be found for it would have been renamed already. And we cannot copy from 'b' instead because 'b' would have been changed already. So