equal
deleted
inserted
replaced
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]))) |
39 err = repo.update(newheads[0], allow=True, remind=False) |
39 err = hg.update(repo, newheads[0], allow=True, remind=False) |
40 if not err and len(newheads) > 1: |
40 if not err and len(newheads) > 1: |
41 ui.status(_('not merging with %d other new heads ' |
41 ui.status(_('not merging with %d other new heads ' |
42 '(use "hg heads" and "hg merge" to merge them)') % |
42 '(use "hg heads" and "hg merge" to merge them)') % |
43 (len(newheads) - 1)) |
43 (len(newheads) - 1)) |
44 if not err: |
44 if not err: |