Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
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 stable 2.9.1
authorMads Kiilerich <madski@unity3d.com>
Sat, 01 Mar 2014 18:09:39 +0100
branchstable
changeset 20615 b96cb15ec9e0
parent 20594 ba619c50a355
child 20616 adec4543e489
merge: audit the right destination file when merging with dir rename
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Tue Feb 25 18:45:01 2014 -0800
+++ b/mercurial/merge.py	Sat Mar 01 18:09:39 2014 +0100
@@ -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:
hg-stable