Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

stable merge: fix dealing with revision 0

The repository explorer passes the revisions as numeric parameters,
so revision 0 was mistakenly interpreted as no revision.

Changeset fd5a42da5ce6…

Parent 36853de1c202…

by Wagner Bruna

Changes to one file · Browse files at fd5a42da5ce6 Showing diff from parent 36853de1c202 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
43
44
45
46
 
47
48
49
50
51
 
52
53
54
 
43
44
45
 
46
47
48
49
50
 
51
52
53
54
@@ -43,12 +43,12 @@
  prevs = [ctx.rev() for ctx in self.repo.parents()]   if len(prevs) > 1:   rev0, rev1 = prevs - elif not rev1: + elif (not rev1 and rev1 != 0):   gdialog.Prompt(_('Unable to merge'),   _('Must supply a target revision'), self).run()   gtklib.idle_add_single_call(self.destroy)   return - elif not rev0: + elif (not rev0 and rev0 != 0):   rev0 = prevs[0]   elif rev1 == prevs[0]:   # selected pair was backwards