Mercurial > hg
comparison tests/test-convert-svn-branches.t @ 20331:1d155582a8ea stable
convert: use branchmap to change default branch in destination (issue3469)
The fix for issue2653 broke the ability to map the default branch of a source
repository to a non-default named branch in the destination repository. Leave
the default behaviour as is, but allow the branch name "None" to be used to map
to a non-default named branch in the destination repository.
author | lstewart |
---|---|
date | Tue, 28 Jan 2014 14:00:23 +1100 |
parents | aa9385f983fa |
children | 7a9cbb315d84 |
comparison
equal
deleted
inserted
replaced
20330:69a0d22b9677 | 20331:1d155582a8ea |
---|---|
94 | 94 |
95 Test hg failing to call itself | 95 Test hg failing to call itself |
96 | 96 |
97 $ HG=foobar hg convert svn-repo B-hg 2>&1 | grep abort | 97 $ HG=foobar hg convert svn-repo B-hg 2>&1 | grep abort |
98 abort: Mercurial failed to run itself, check hg executable is in PATH | 98 abort: Mercurial failed to run itself, check hg executable is in PATH |
99 | |
100 Convert 'trunk' to branch other than 'default' | |
101 | |
102 $ cat > branchmap <<EOF | |
103 > None hgtrunk | |
104 > | |
105 > | |
106 > EOF | |
107 $ hg convert --branchmap=branchmap --datesort -r 10 svn-repo C-hg | |
108 initializing destination C-hg repository | |
109 scanning source... | |
110 sorting... | |
111 converting... | |
112 10 init projA | |
113 9 hello | |
114 8 branch trunk, remove c and dir | |
115 7 change a | |
116 6 change b | |
117 5 move and update c | |
118 4 move and update c | |
119 3 change b again | |
120 2 move to old2 | |
121 1 move back to old | |
122 0 last change to a | |
123 | |
124 $ cd C-hg | |
125 $ hg branches | |
126 hgtrunk 10:745f063703b4 | |
127 old 9:aa50d7b8d922 | |
128 old2 8:c85a22267b6e (inactive) | |
129 $ cd .. | |
130 |