Mercurial > hg
view tests/test-eol-hook @ 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
#!/bin/sh cat > $HGRCPATH <<EOF [diff] git = True EOF hg init main cat > main/.hg/hgrc <<EOF [extensions] eol = [hooks] pretxnchangegroup = python:hgext.eol.hook EOF hg clone main fork cd fork cat > .hgeol <<EOF [patterns] mixed.txt = BIN **.txt = native EOF hg add .hgeol hg commit -m 'Commit .hgeol' printf "first\nsecond\nthird\n" > a.txt hg add a.txt echo "% hg commit (LF a.txt)" hg commit -m 'LF a.txt' echo "% hg push" hg push ../main printf "first\r\nsecond\r\nthird\n" > a.txt echo "% hg commit (CRLF a.txt)" hg commit -m 'CRLF a.txt' echo "% hg push" hg push ../main echo "% hg commit (LF a.txt)" printf "first\nsecond\nthird\n" > a.txt hg commit -m 'LF a.txt (fixed)' echo "% hg push" hg push ../main