Mercurial > hg
diff mercurial/patch.py @ 7972:425a30ddfff6
merge with crew-stable
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Sat, 04 Apr 2009 19:43:00 +0200 |
parents | 4a4c7f6a5912 6ea0318daf75 |
children | 388bb482024e |
line wrap: on
line diff
--- a/mercurial/patch.py Sat Apr 04 18:08:41 2009 +0200 +++ b/mercurial/patch.py Sat Apr 04 19:43:00 2009 +0200 @@ -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