equal
deleted
inserted
replaced
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 and len(newchildren): |
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.update(repo, newchildren[0]) |
89 else: |
89 else: |
90 return 0 |
90 return 0 |
91 |
91 |
92 # Are there more than one additional branch heads? |
92 # Are there more than one additional branch heads? |
93 newchildren = [n for n in newchildren if n != parent] |
93 newchildren = [n for n in newchildren if n != parent] |