Re: [StGit PATCH] Add mergetool support to the classic StGit infrastructure

On 2009-02-11 10:25:13 +0100, Karl Hasselström wrote:

On 2009-02-10 14:14:17 +0000, Catalin Marinas wrote:

quoted

@@ -754,7 +758,6 @@ def resolved(filenames, reset = None):
              '--stdin', '-z').input_nulterm(filenames).no_output()
     GRun('update-index', '--add', '--').xargs(filenames)
     for filename in filenames:
-        gitmergeonefile.clean_up(filename)
         # update the access and modificatied times
         os.utime(filename, None)

Hmm, what does this line do, and why isn't it needed anymore? I
don't know this part of StGit, I'm just curious ...

Oh, right, it removes the .current/.patched/.ancestor files.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle