Mercurial > hg > mercurial-source

changeset 20617:b96cb15ec9e0 stable 2.9.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: audit the right destination file when merging with dir rename
author Mads Kiilerich <madski@unity3d.com>
date Sat, 01 Mar 2014 18:09:39 +0100 (2014-03-01)
parents ba619c50a355
children adec4543e489
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -654,7 +654,7 @@
             f2, fd, flags = args
             if f:
                 repo.ui.note(_("moving %s to %s\n") % (f, fd))
-                audit(f)
+                audit(fd)
                 repo.wwrite(fd, wctx.filectx(f).data(), flags)
                 util.unlinkpath(repo.wjoin(f))
             if f2: