# HG changeset patch # User Chris Mason # Date 1151419786 14400 # Node ID e4deeaac5e743ded15ec252b79b27cd48426e963 # Parent 041d8f0a843799c96a1ae245100fe645b26d141c mq: fix qparents to return the correct parent when no patches are applied diff -r 041d8f0a8437 -r e4deeaac5e74 hgext/mq.py --- 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):