Mercurial > hg
diff mercurial/merge.py @ 5060:2ef14e29e538
Merge with -stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 02 Aug 2007 13:23:53 -0500 |
parents | bf444a9a9c23 8d9bdcbb2b18 |
children | d316124ebbea |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Aug 02 14:51:49 2007 +0200 +++ b/mercurial/merge.py Thu Aug 02 13:23:53 2007 -0500 @@ -415,10 +415,10 @@ updated += 1 else: merged += 1 - if f != fd and move: + util.set_exec(repo.wjoin(fd), "x" in flags) + if f != fd and move and util.lexists(repo.wjoin(f)): repo.ui.debug(_("removing %s\n") % f) os.unlink(repo.wjoin(f)) - util.set_exec(repo.wjoin(fd), "x" in flags) elif m == "g": # get flags = a[2] repo.ui.note(_("getting %s\n") % f)