Mercurial > hg
diff tests/test-branch-option.out @ 11322:3d6915f5a2bb
improve --branch processing (and differentiate from # syntax)
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.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Thu, 10 Jun 2010 12:46:09 +0200 |
parents | b66e414d38b0 |
children |
line wrap: on
line diff
--- a/tests/test-branch-option.out Sun Jun 06 17:25:00 2010 +0900 +++ b/tests/test-branch-option.out Thu Jun 10 12:46:09 2010 +0200 @@ -15,9 +15,14 @@ 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