Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.5, 2.1, and 2.1.1

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

Changeset fddcfe2708d0…

Parent 161fbab6745a…

by Steve Borho

Changes to one file · Browse files at fddcfe2708d0 Showing diff from parent 161fbab6745a Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
584
585
586
587
588
589
590
 
 
 
 
 
591
592
593
 
584
585
586
 
 
 
 
587
588
589
590
591
592
593
594
@@ -584,10 +584,11 @@
  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)