[PATCH] mq qparents fix

Chris Mason mason at suse.com
Tue Jun 27 10:29:27 CDT 2006


# HG changeset patch
# User Chris Mason <mason at suse.com>
# Date 1151419786 14400
# Node ID 35f0339aebae98dd29933b3bb1c2a635e4216762
# Parent  b73552a00b209c8fcd71fd23fb990c5d05910010
mq: fix qparents to return the correct parent when no patches are applied

diff -r b73552a00b20 -r 35f0339aebae hgext/mq.py
--- a/hgext/mq.py	Mon Jun 26 16:47:24 2006 +0200
+++ b/hgext/mq.py	Tue Jun 27 10:49:46 2006 -0400
@@ -214,7 +214,6 @@ class queue:
                 return pp[0]
             if p1 in arevs:
                 return pp[1]
-            return None
         return pp[0]
 
     def mergepatch(self, repo, mergeq, series, wlock):


More information about the Mercurial mailing list