Show More
@@ -30,7 +30,9 b' def addbranchrevs(lrepo, repo, branches,' | |||||
30 | if branch == '.': |
|
30 | if branch == '.': | |
31 | if not lrepo or not lrepo.local(): |
|
31 | if not lrepo or not lrepo.local(): | |
32 | raise util.Abort(_("dirstate branch not accessible")) |
|
32 | raise util.Abort(_("dirstate branch not accessible")) | |
33 |
b |
|
33 | butf8 = lrepo.dirstate.branch() | |
|
34 | branch = encoding.tolocal(butf8) | |||
|
35 | else: | |||
34 | butf8 = encoding.fromlocal(branch) |
|
36 | butf8 = encoding.fromlocal(branch) | |
35 | if butf8 in branchmap: |
|
37 | if butf8 in branchmap: | |
36 | revs.extend(node.hex(r) for r in reversed(branchmap[butf8])) |
|
38 | revs.extend(node.hex(r) for r in reversed(branchmap[butf8])) |
@@ -20,6 +20,14 b' hg branch b' | |||||
20 | echo b > foo |
|
20 | echo b > foo | |
21 | hg ci -d '0 0' -mb |
|
21 | hg ci -d '0 0' -mb | |
22 | hg up 0 |
|
22 | hg up 0 | |
|
23 | hg --encoding utf-8 branch æ | |||
|
24 | echo ae1 > foo | |||
|
25 | hg ci -d '0 0' -mae1 | |||
|
26 | hg up 0 | |||
|
27 | hg --encoding utf-8 branch -f æ | |||
|
28 | echo ae2 > foo | |||
|
29 | hg ci -d '0 0' -mae2 | |||
|
30 | hg up 0 | |||
23 | hg branch -f b |
|
31 | hg branch -f b | |
24 | echo b2 > foo |
|
32 | echo b2 > foo | |
25 | hg ci -d '0 0' -mb2 |
|
33 | hg ci -d '0 0' -mb2 | |
@@ -30,6 +38,10 b' hg in -qr c -b a' | |||||
30 | echo out branch . |
|
38 | echo out branch . | |
31 | hg out -q ../branch#. |
|
39 | hg out -q ../branch#. | |
32 | hg out -q -b . |
|
40 | hg out -q -b . | |
|
41 | echo out branch . non-ascii | |||
|
42 | hg --encoding utf-8 up æ | |||
|
43 | hg --encoding latin1 out -q ../branch#. | |||
|
44 | hg --encoding latin1 out -q -b . | |||
33 | echo clone branch b |
|
45 | echo clone branch b | |
34 | cd .. |
|
46 | cd .. | |
35 | hg clone branch2#b branch3 |
|
47 | hg clone branch2#b branch3 |
@@ -12,6 +12,12 b' 1 files updated, 0 files merged, 0 files' | |||||
12 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
12 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
13 | marked working directory as branch b |
|
13 | marked working directory as branch b | |
14 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
14 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
15 | marked working directory as branch æ | |||
|
16 | created new head | |||
|
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
18 | marked working directory as branch æ | |||
|
19 | created new head | |||
|
20 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
15 | marked working directory as branch b |
|
21 | marked working directory as branch b | |
16 | in rev c branch a |
|
22 | in rev c branch a | |
17 | 1:dd6e60a716c6 |
|
23 | 1:dd6e60a716c6 | |
@@ -20,9 +26,15 b' 1:dd6e60a716c6' | |||||
20 | 2:f25d57ab0566 |
|
26 | 2:f25d57ab0566 | |
21 | out branch . |
|
27 | out branch . | |
22 | 1:b84708d77ab7 |
|
28 | 1:b84708d77ab7 | |
23 |
|
|
29 | 4:65511d0e2b55 | |
24 | 1:b84708d77ab7 |
|
30 | 1:b84708d77ab7 | |
25 |
|
|
31 | 4:65511d0e2b55 | |
|
32 | out branch . non-ascii | |||
|
33 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
34 | 2:df5a44224d4e | |||
|
35 | 3:4f4a5125ca10 | |||
|
36 | 2:df5a44224d4e | |||
|
37 | 3:4f4a5125ca10 | |||
26 | clone branch b |
|
38 | clone branch b | |
27 | requesting all changes |
|
39 | requesting all changes | |
28 | adding changesets |
|
40 | adding changesets |
General Comments 0
You need to be logged in to leave comments.
Login now