Mercurial > hg
comparison tests/test-update-branches.t @ 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 | bc13e17067d9 |
| children | bfe89d65d651 |
comparison
equal
deleted
inserted
replaced
| 14484:4582a4dd1817 | 14485:610873cf064a |
|---|---|
| 75 $ norevtest 'none clean linear' clean 4 | 75 $ norevtest 'none clean linear' clean 4 |
| 76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 77 parent=5 | 77 parent=5 |
| 78 | 78 |
| 79 $ norevtest 'none clean same' clean 2 | 79 $ norevtest 'none clean same' clean 2 |
| 80 abort: crosses branches (merge branches or use --check to force update) | 80 abort: crosses branches (merge branches or update --check to force update) |
| 81 parent=2 | 81 parent=2 |
| 82 | 82 |
| 83 | 83 |
| 84 $ revtest 'none clean linear' clean 1 2 | 84 $ revtest 'none clean linear' clean 1 2 |
| 85 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 85 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |