Mercurial > hg

annotate tests/test-branch-option @ 11306:deaeb2d84d8a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix encoding bug in 05ac42e56452
author Sune Foldager <cryo@cyanite.org>
date Tue, 08 Jun 2010 13:19:22 +0200
parents a78bfaf988e1
children 3d6915f5a2bb
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 #!/bin/sh
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
2
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
3 # test branch selection options
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
4 hg init branch
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
5 cd branch
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
6 hg branch a
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
7 echo a > foo
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
8 hg ci -d '0 0' -Ama
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
9 echo a2 > foo
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
10 hg ci -d '0 0' -ma2
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
11 hg up 0
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
12 hg branch c
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
13 echo c > foo
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
14 hg ci -d '0 0' -mc
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
15 cd ..
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
16 hg clone -r 0 branch branch2
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
17 cd branch2
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
18 hg up 0
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
19 hg branch b
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
20 echo b > foo
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
21 hg ci -d '0 0' -mb
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
22 hg up 0
11306
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
23 hg --encoding utf-8 branch æ
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
24 echo ae1 > foo
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
25 hg ci -d '0 0' -mae1
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
26 hg up 0
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
27 hg --encoding utf-8 branch -f æ
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
28 echo ae2 > foo
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
29 hg ci -d '0 0' -mae2
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
30 hg up 0
10365
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
31 hg branch -f b
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
32 echo b2 > foo
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
33 hg ci -d '0 0' -mb2
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
34
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
35 echo in rev c branch a
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
36 hg in -qr c ../branch#a
10379
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
Sune Foldager <cryo@cyanite.org>
parents: 10365
diff changeset
37 hg in -qr c -b a
10365
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
38 echo out branch .
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
39 hg out -q ../branch#.
10379
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
Sune Foldager <cryo@cyanite.org>
parents: 10365
diff changeset
40 hg out -q -b .
11306
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
41 echo out branch . non-ascii
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
42 hg --encoding utf-8 up æ
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
43 hg --encoding latin1 out -q ../branch#.
deaeb2d84d8a fix encoding bug in 05ac42e56452
Sune Foldager <cryo@cyanite.org>
parents: 10379
diff changeset
44 hg --encoding latin1 out -q -b .
10365
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
45 echo clone branch b
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
46 cd ..
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
47 hg clone branch2#b branch3
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
48 hg -q -R branch3 heads b
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
49 hg -q -R branch3 parents
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
50 rm -rf branch3
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
51 echo clone rev a branch b
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
52 hg clone -r a branch2#b branch3
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
53 hg -q -R branch3 heads b
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
54 hg -q -R branch3 parents
d757bc0c7865 interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
55 rm -rf branch3