mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
ea84333a75
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.
38 lines
1012 B
Perl
38 lines
1012 B
Perl
$ hg init
|
|
$ echo This is file a1 > a
|
|
$ echo This is file b1 > b
|
|
$ hg add a b
|
|
$ hg commit -m "commit #0"
|
|
$ echo This is file b22 > b
|
|
$ hg commit -m "comment #1"
|
|
$ hg update 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ rm b
|
|
$ hg commit -A -m "comment #2"
|
|
removing b
|
|
created new head
|
|
$ hg update 1
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg update
|
|
abort: crosses branches (merge branches or update --check to force update)
|
|
[255]
|
|
$ hg update -c
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ mv a c
|
|
|
|
In theory, we shouldn't need the "-y" below, but it prevents this test
|
|
from hanging when "hg update" erroneously prompts the user for "keep
|
|
or delete".
|
|
|
|
Should abort:
|
|
|
|
$ hg update -y 1
|
|
abort: crosses branches (merge branches or use --clean to discard changes)
|
|
[255]
|
|
$ mv c a
|
|
|
|
Should succeed:
|
|
|
|
$ hg update -y 1
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|