changeset 2512:e4deeaac5e74

mq: fix qparents to return the correct parent when no patches are applied
author Chris Mason <mason@suse.com>
date Tue, 27 Jun 2006 10:49:46 -0400
parents 041d8f0a8437
children f22e3e8fd457
files hgext/mq.py
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/mq.py	Tue Jun 27 11:23:06 2006 -0400
+++ b/hgext/mq.py	Tue Jun 27 10:49:46 2006 -0400
@@ -214,7 +214,6 @@
                 return pp[0]
             if p1 in arevs:
                 return pp[1]
-            return None
         return pp[0]
 
     def mergepatch(self, repo, mergeq, series, wlock):