Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: fix qparents to return the correct parent when no patches are applied
authorChris Mason <mason@suse.com>
Tue, 27 Jun 2006 10:49:46 -0400
changeset 2512 e4deeaac5e74
parent 2511 041d8f0a8437
child 2513 f22e3e8fd457
mq: fix qparents to return the correct parent when no patches are applied
hgext/mq.py file | annotate | diff | comparison | revisions 
--- 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):
hg-stable