Mercurial > hg
view tests/test-eol-hook.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 | 0bb67503ad4b |
children |
line wrap: on
line source
updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved % hg commit (LF a.txt) % hg push pushing to ../main searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files % hg commit (CRLF a.txt) % hg push pushing to ../main searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files error: pretxnchangegroup hook failed: a.txt should not have CRLF line endings transaction abort! rollback completed abort: a.txt should not have CRLF line endings % hg commit (LF a.txt) % hg push pushing to ../main searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files