mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
2dcf98d614
Bare 'hg update' now brings you to the tipmost descendant (on the same branch). Leaving the user on the same topological branch. The previous behavior, updating to the tipmost changeset on the same branch could lead to jump from a topological branch to another. This was confusing and impractical. As the only conceivable reason for the old behavior have been address by the recently introduce message about other heads, we can "safely" change this behavior All test changes have been reviewed and seen a valid consequences.
37 lines
837 B
Perl
37 lines
837 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
|
|
$ rm b
|
|
$ hg update -c 2
|
|
abort: uncommitted changes
|
|
[255]
|
|
$ hg revert b
|
|
$ hg update -c 2
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ mv a c
|
|
|
|
Should abort:
|
|
|
|
$ hg update 1
|
|
abort: uncommitted changes
|
|
(commit or update --clean to discard changes)
|
|
[255]
|
|
$ mv c a
|
|
|
|
Should succeed:
|
|
|
|
$ hg update 1
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|