mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
4e663d3541
Previously #foo and --branch foo were handled identically. The behavior of #foo hasn't changed, but --branch now works like this: 1) If branchmap is not supported on the remote, the operation fails. 2) If branch is '.', substitute with branch of the working dir parent. 3) If branch exists remotely, its heads are expanded. 4) Otherwise, the operation fails. Tests have been added for the new cases.
64 lines
1.8 KiB
Plaintext
64 lines
1.8 KiB
Plaintext
marked working directory as branch a
|
|
adding foo
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
marked working directory as branch c
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
updating to branch a
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
marked working directory as branch b
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
marked working directory as branch æ
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
marked working directory as branch æ
|
|
created new head
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
marked working directory as branch b
|
|
created new head
|
|
unknown branch and fallback
|
|
abort: unknown branch 'z'!
|
|
2:f25d57ab0566
|
|
abort: unknown branch 'z'!
|
|
in rev c branch a
|
|
1:dd6e60a716c6
|
|
2:f25d57ab0566
|
|
1:dd6e60a716c6
|
|
2:f25d57ab0566
|
|
out branch .
|
|
1:b84708d77ab7
|
|
4:65511d0e2b55
|
|
1:b84708d77ab7
|
|
4:65511d0e2b55
|
|
out branch . non-ascii
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
2:df5a44224d4e
|
|
3:4f4a5125ca10
|
|
2:df5a44224d4e
|
|
3:4f4a5125ca10
|
|
clone branch b
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 1 files (+1 heads)
|
|
updating to branch b
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
2:65511d0e2b55
|
|
1:b84708d77ab7
|
|
2:65511d0e2b55
|
|
clone rev a branch b
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 1 files (+1 heads)
|
|
updating to branch a
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
2:65511d0e2b55
|
|
1:b84708d77ab7
|
|
0:5b65ba7c951d
|