Mercurial > public > mercurial-scm > hg

diff mercurial/patch.py @ 7971:6ea0318daf75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issue1495, corner case of adding empty files via patching
author Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
date Tue, 24 Mar 2009 23:28:55 +0000
parents 162fd31bbd93
children 425a30ddfff6
line wrap: on
line diff
--- a/mercurial/patch.py	Fri Apr 03 11:50:42 2009 -0500
+++ b/mercurial/patch.py	Tue Mar 24 23:28:55 2009 +0000
@@ -910,7 +910,7 @@
                 # else error?
                 # copy/rename + modify should modify target, not source
                 gp = changed.get(bfile)
-                if gp and gp.op in ('COPY', 'DELETE', 'RENAME'):
+                if gp and gp.op in ('COPY', 'DELETE', 'RENAME', 'ADD'):
                     afile = bfile
                     gitworkdone = True
             newfile = True