##// END OF EJS Templates
fetch: patch cornercase in children calculation (issue2773)
Matt Mackall -
r15748:6eb5bbaa stable
parent child Browse files
Show More
@@ -83,7 +83,7 b" def fetch(ui, repo, source='default', **"
83 # Is this a simple fast-forward along the current branch?
83 # Is this a simple fast-forward along the current branch?
84 newheads = repo.branchheads(branch)
84 newheads = repo.branchheads(branch)
85 newchildren = repo.changelog.nodesbetween([parent], newheads)[2]
85 newchildren = repo.changelog.nodesbetween([parent], newheads)[2]
86 if len(newheads) == 1:
86 if len(newheads) == 1 and len(newchildren):
87 if newchildren[0] != parent:
87 if newchildren[0] != parent:
88 return hg.clean(repo, newchildren[0])
88 return hg.clean(repo, newchildren[0])
89 else:
89 else:
General Comments 0
You need to be logged in to leave comments. Login now