# HG changeset patch
# User Wagner Bruna <wbr...@softwareexpress.com.br>
# Date 1266594139 7200
# Branch stable
# Node ID fd5a42da5ce6af797d66fa3e8820f7816920a3db
# Parent 36853de1c202b8d18fc975f2213bd7cdb1624cde
merge: fix dealing with revision 0
The repository explorer passes the revisions as numeric parameters,
so revision 0 was mistakenly interpreted as no revision.
diff --git a/tortoisehg/hgtk/merge.py b/tortoisehg/hgtk/merge.py
--- a/tortoisehg/hgtk/merge.py
+++ b/tortoisehg/hgtk/merge.py
@@ -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
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
