view tests/test-hgcia @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges.

Fixes issue1533.

#!/bin/sh

cat >> $HGRCPATH <<EOF
[extensions]
hgcia=

[hooks]
changegroup.cia = python:hgext.hgcia.hook

[cia]
user = testuser
project = testproject
test = True
EOF

hg init src
hg init cia

cd src
echo foo > foo
hg ci -Amfoo

hg push ../cia