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

Merge with stable

Changeset 04bfd9de1065…

Parents e20650ed44ce…

Parents fddcfe2708d0…

by Steve Borho

Changes to one file · Browse files at 04bfd9de1065 Showing diff from parent e20650ed44ce fddcfe2708d0 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
628
629
630
631
632
633
634
 
 
 
 
 
635
636
637
 
628
629
630
 
 
 
 
631
632
633
634
635
636
637
638
@@ -628,10 +628,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)