Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 4682:dc5920ea12f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix small bug with a failed merge across a rename If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy f to fd, and util.set_exec wouldn't find the file.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 22 Jun 2007 20:44:40 -0300
parents 723e0ddb6ada
children 8808ea7da86b
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Jun 22 19:43:29 2007 -0300
+++ b/mercurial/merge.py	Fri Jun 22 20:44:40 2007 -0300
@@ -401,12 +401,12 @@
                     updated += 1
                 else:
                     merged += 1
-                if f != fd:
-                    repo.ui.debug(_("copying %s to %s\n") % (f, fd))
-                    repo.wwrite(fd, repo.wread(f), flags)
-                    if move:
-                        repo.ui.debug(_("removing %s\n") % f)
-                        os.unlink(repo.wjoin(f))
+            if f != fd:
+                repo.ui.debug(_("copying %s to %s\n") % (f, fd))
+                repo.wwrite(fd, repo.wread(f), flags)
+                if move:
+                    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]