view tests/test-convert-svn-branches.out @ 11965:77f1f206e135 stable

mq: don't inherit default and default-push paths with --mq (issue2333)

Configuration from the outer repo is inherited to the patches repo when --mq is
used.

In case the patches repo only has paths.default configured but the outer repo
has paths.default-push then the inherited default-push will win. Very
confusing.

Inheriting the default paths is however wrong in all sane cases, so now we
explicitly remove them.

% convert trunk and branches
initializing destination A-hg repository
scanning source...
sorting...
converting...
10 init projA
9 hello
8 branch trunk, remove c and dir
7 change a
6 change b
5 move and update c
4 move and update c
3 change b again
2 move to old2
1 move back to old
0 last change to a
% convert again
scanning source...
sorting...
converting...
0 branch trunk@1 into old3
o  branch=newbranch 11 branch trunk@1 into old3 files:
|
| o  branch= 10 last change to a files: a
| |
| | o  branch=old 9 move back to old files:
| | |
| | o  branch=old2 8 move to old2 files:
| | |
| | o  branch=old 7 change b again files: b
| | |
| o |  branch= 6 move and update c files: b
| | |
| | o  branch=old 5 move and update c files: c
| | |
| | o  branch=old 4 change b files: b
| | |
| o |  branch= 3 change a files: a
| | |
| | o  branch=old 2 branch trunk, remove c and dir files: c
| |/
| o  branch= 1 hello files: a b c dir/e
|/
o  branch= 0 init projA files:

newbranch                     11:
default                       10:
old                            9:
old2                           8:
tip
% test hg failing to call itself
abort: Mercurial failed to run itself, check hg executable is in PATH