Mercurial > hg
comparison tests/test-merge5.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 | 6da47b655d97 |
comparison
equal
deleted
inserted
replaced
14484:4582a4dd1817 | 14485:610873cf064a |
---|---|
12 removing b | 12 removing b |
13 created new head | 13 created new head |
14 $ hg update 1 | 14 $ hg update 1 |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16 $ hg update | 16 $ hg update |
17 abort: crosses branches (merge branches or use --check to force update) | 17 abort: crosses branches (merge branches or update --check to force update) |
18 [255] | 18 [255] |
19 $ hg update -c | 19 $ hg update -c |
20 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 20 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
21 $ mv a c | 21 $ mv a c |
22 | 22 |