Mercurial > hg-git

changeset 162:cb38ac7f9373

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved file rename code back to proper indent
author Scott Chacon <schacon@gmail.com>
date Wed, 27 May 2009 17:27:23 -0700
parents 134915637cf7
children 74f38b519887
files TODO.txt git_handler.py
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/TODO.txt	Wed May 27 17:19:11 2009 -0700
+++ b/TODO.txt	Wed May 27 17:27:23 2009 -0700
@@ -8,7 +8,6 @@
 
 MAPPING ISSUES
 ==============
-* octopus merge explode/implode
 * work in Git on a named branch created in Hg is forward-ported to be named branch commits in Hg and stripped back out if re-exported
 * timezone issues (?)
 
--- a/git_handler.py	Wed May 27 17:19:11 2009 -0700
+++ b/git_handler.py	Wed May 27 17:27:23 2009 -0700
@@ -711,11 +711,12 @@
             if gparents:
                 p1 = gparents.pop()
 
-            # wierd hack for explicit file renames in first but not second branch
-            if not (p2 == nullid):
-                vals = [item for item in self.renames[p1].values() if not item in self.renames[p2].values()]
-                for removefile in vals:
-                    files.remove(removefile)
+        # wierd hack for explicit file renames in first but not second branch
+        if not (p2 == nullid):
+            vals = [item for item in self.renames[p1].values() if not item in self.renames[p2].values()]
+            for removefile in vals:
+                files.remove(removefile)
+
         extra = {}
 
         # if named branch, add to extra