view tests/test-eol-hook @ 11353:f2b25e8ea6c1

merge: when current branch has 1 or > 2 heads, actually abort.

Currently merge just prints abort-like messages to stderr and then
exits with a misleading status 0 (cleverly disguised as "False").
With this change it raises Abort, just like every other fatal error.

#!/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