Mercurial > hg

changeset 15748:6eb5bbaa1e73 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fetch: patch cornercase in children calculation (issue2773)
author Matt Mackall <mpm@selenic.com>
date Fri, 30 Dec 2011 14:31:59 -0600
parents 4bf553038b82
children 6b84cdcb05b9
files hgext/fetch.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/fetch.py	Thu Dec 29 14:44:30 2011 -0600
+++ b/hgext/fetch.py	Fri Dec 30 14:31:59 2011 -0600
@@ -83,7 +83,7 @@
         # Is this a simple fast-forward along the current branch?
         newheads = repo.branchheads(branch)
         newchildren = repo.changelog.nodesbetween([parent], newheads)[2]
-        if len(newheads) == 1:
+        if len(newheads) == 1 and len(newchildren):
             if newchildren[0] != parent:
                 return hg.clean(repo, newchildren[0])
             else: