Mercurial > hg
view tests/test-rebase-issue-noparam-single-rev.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.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 18 Aug 2010 02:43:45 +0200 |
parents | 7a9cf012dddc |
children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head @ 4:r2 | o 3:r1 | | o 2:l1 |/ o 1:c2 | o 0:c1 % Rebase with no arguments - single revision in source branch 1 files updated, 0 files merged, 2 files removed, 0 files unresolved saved backup bundle to @ 4:l1 | o 3:r2 | o 2:r1 | o 1:c2 | o 0:c1 0 files updated, 0 files merged, 2 files removed, 0 files unresolved created new head @ 4:r1 | | o 3:l2 | | | o 2:l1 |/ o 1:c2 | o 0:c1 % Rebase with no arguments - single revision in target branch 2 files updated, 0 files merged, 1 files removed, 0 files unresolved saved backup bundle to @ 4:l2 | o 3:l1 | o 2:r1 | o 1:c2 | o 0:c1