Mercurial > hg
view tests/test-eol-add @ 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 = 1 EOF seteol () { if [ $1 = "LF" ]; then EOL='\n' else EOL='\r\n' fi } makerepo () { echo echo "# ==== setup repository ====" echo '% hg init' hg init repo cd repo printf "first\nsecond\nthird\n" > a.txt hg commit -d '100 0' --addremove -m 'LF commit' cd .. } dotest () { seteol $1 echo echo "% hg clone repo repo-$1" hg clone repo repo-$1 cd repo-$1 cat > .hg/hgrc <<EOF [extensions] eol = [eol] native = LF EOF cat > .hgeol <<EOF [patterns] **.txt = native [repository] native = $1 EOF echo '% hg add .hgeol' hg add .hgeol echo '% hg status' hg status echo '% hg commit' hg commit -d '200 0' -m 'Added .hgeol file' echo '% hg status' hg status echo '% hg tip -p' hg tip -p | python $TESTDIR/printrepr.py cd .. rm -r repo-$1 } makerepo dotest LF dotest CRLF rm -r repo