Mercurial > hg

annotate tests/test-branch-option.out @ 11322:3d6915f5a2bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10365
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
1 marked working directory as branch a
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
2 adding foo
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
4 marked working directory as branch c
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
5 requesting all changes
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
6 adding changesets
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
7 adding manifests
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
8 adding file changes
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
9 added 1 changesets with 1 changes to 1 files
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
10 updating to branch a
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
12 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
13 marked working directory as branch b
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
11306
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 11299
diff changeset
15 marked working directory as branch æ
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 11299
diff changeset
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 11299
diff changeset
17 marked working directory as branch æ
11322
3d6915f5a2bb improve --branch processing (and differentiate from # syntax)
Sune Foldager <cryo@cyanite.org>
parents: 11317
diff changeset
18 created new head
11306
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 11299
diff changeset
19 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
10365
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
20 marked working directory as branch b
11317
b66e414d38b0 commit: fix display of 'created new head' message (issue2186)
Gilles Moris <gilles.moris@free.fr>
parents: 11315
diff changeset
21 created new head
11322
3d6915f5a2bb improve --branch processing (and differentiate from # syntax)
Sune Foldager <cryo@cyanite.org>
parents: 11317
diff changeset
22 unknown branch and fallback
3d6915f5a2bb improve --branch processing (and differentiate from # syntax)
Sune Foldager <cryo@cyanite.org>
parents: 11317
diff changeset
23 abort: unknown branch 'z'!
3d6915f5a2bb improve --branch processing (and differentiate from # syntax)
Sune Foldager <cryo@cyanite.org>
parents: 11317
diff changeset
24 2:f25d57ab0566
3d6915f5a2bb improve --branch processing (and differentiate from # syntax)
Sune Foldager <cryo@cyanite.org>
parents: 11317
diff changeset
25 abort: unknown branch 'z'!
10365
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
26 in rev c branch a
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
27 1:dd6e60a716c6
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
28 2:f25d57ab0566
10379
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
Sune Foldager <cryo@cyanite.org>
parents: 10365
diff changeset
29 1:dd6e60a716c6
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
Sune Foldager <cryo@cyanite.org>
parents: 10365
diff changeset
30 2:f25d57ab0566
10365
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
31 out branch .
11299
05ac42e56452 push/pull: fix bug in "--branch ." handling
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
32 1:b84708d77ab7
11306
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 11299
diff changeset
33 4:65511d0e2b55
11299
05ac42e56452 push/pull: fix bug in "--branch ." handling
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
34 1:b84708d77ab7
11306
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 11299
diff changeset
35 4:65511d0e2b55
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 11299
diff changeset
36 out branch . non-ascii
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 11299
diff changeset
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 11299
diff changeset
38 2:df5a44224d4e
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 11299
diff changeset
39 3:4f4a5125ca10
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 11299
diff changeset
40 2:df5a44224d4e
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 11299
diff changeset
41 3:4f4a5125ca10
10365
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
42 clone branch b
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
43 requesting all changes
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
44 adding changesets
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
45 adding manifests
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
46 adding file changes
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
47 added 3 changesets with 3 changes to 1 files (+1 heads)
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
48 updating to branch b
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
49 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
50 2:65511d0e2b55
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
51 1:b84708d77ab7
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
52 2:65511d0e2b55
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
53 clone rev a branch b
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
54 requesting all changes
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
55 adding changesets
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
56 adding manifests
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
57 adding file changes
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
58 added 3 changesets with 3 changes to 1 files (+1 heads)
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
59 updating to branch a
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
61 2:65511d0e2b55
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
62 1:b84708d77ab7
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
63 0:5b65ba7c951d