equal
deleted
inserted
replaced
22 |
22 |
23 def postincoming(other, modheads): |
23 def postincoming(other, modheads): |
24 if modheads == 0: |
24 if modheads == 0: |
25 return 0 |
25 return 0 |
26 if modheads == 1: |
26 if modheads == 1: |
27 return hg.update(repo, repo.changelog.tip(), wlock=wlock) |
27 return hg.clean(repo, repo.changelog.tip(), wlock=wlock) |
28 newheads = repo.heads(parent) |
28 newheads = repo.heads(parent) |
29 newchildren = [n for n in repo.heads(parent) if n != parent] |
29 newchildren = [n for n in repo.heads(parent) if n != parent] |
30 newparent = parent |
30 newparent = parent |
31 if newchildren: |
31 if newchildren: |
32 newparent = newchildren[0] |
32 newparent = newchildren[0] |
33 hg.update(repo, newparent, wlock=wlock) |
33 hg.clean(repo, newparent, wlock=wlock) |
34 newheads = [n for n in repo.heads() if n != newparent] |
34 newheads = [n for n in repo.heads() if n != newparent] |
35 err = False |
35 err = False |
36 if newheads: |
36 if newheads: |
37 ui.status(_('merging with new head %d:%s\n') % |
37 ui.status(_('merging with new head %d:%s\n') % |
38 (repo.changelog.rev(newheads[0]), short(newheads[0]))) |
38 (repo.changelog.rev(newheads[0]), short(newheads[0]))) |