Commits

Steve Borho committed fddcfe2

commit: ignore autoinc when committing a merge (fixes #712)

Comments (0)

Files changed (1)

tortoisehg/hgqt/commit.py

         cmdline = ['commit', '--repository', repo.root, '--verbose',
                    '--user', user, '--message='+msg]
         cmdline += dcmd + brcmd + [repo.wjoin(f) for f in files]
-        for fname in self.opts.get('autoinc', '').split(','):
-            fname = fname.strip()
-            if fname:
-                cmdline.extend(['--include', fname])
+        if len(repo.parents()) == 1:
+            for fname in self.opts.get('autoinc', '').split(','):
+                fname = fname.strip()
+                if fname:
+                    cmdline.extend(['--include', fname])
 
         commandlines.append(cmdline)