Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 14485:610873cf064a
Make pull -u behave like pull && update
Previously, pull would not update if new branch heads were received,
whereas pull && update would move to the tipmost branch head.
Also change the "crosses branches" abort in merge.update from
"crosses branches (merge branches or use --check to force update)"
to
"crosses branches (merge branches or update --check to force update)"
since it can no longer assume the user is running hg update.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Tue, 31 May 2011 11:52:22 -0700 |
| parents | cc8c09855d19 |
| children | 88cb01c4575e |
comparison
equal
deleted
inserted
replaced
| 14484:4582a4dd1817 | 14485:610873cf064a |
|---|---|
| 527 pass # all good | 527 pass # all good |
| 528 elif wc.files() or wc.deleted(): | 528 elif wc.files() or wc.deleted(): |
| 529 raise util.Abort(_("crosses branches (merge branches or use" | 529 raise util.Abort(_("crosses branches (merge branches or use" |
| 530 " --clean to discard changes)")) | 530 " --clean to discard changes)")) |
| 531 elif onode is None: | 531 elif onode is None: |
| 532 raise util.Abort(_("crosses branches (merge branches or use" | 532 raise util.Abort(_("crosses branches (merge branches or update" |
| 533 " --check to force update)")) | 533 " --check to force update)")) |
| 534 else: | 534 else: |
| 535 # Allow jumping branches if clean and specific rev given | 535 # Allow jumping branches if clean and specific rev given |
| 536 overwrite = True | 536 overwrite = True |
| 537 | 537 |