view tests/test-username-newline @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents 9d023ef7b467
children
line wrap: on
line source

#!/bin/sh
#

hg init foo
cd foo
touch a


unset HGUSER
echo "[ui]" >> .hg/hgrc
echo "username= foo" >> .hg/hgrc
echo "          bar1" >> .hg/hgrc

hg ci -Am m

rm .hg/hgrc

HGUSER=`(echo foo; echo bar2)` hg ci -Am m

hg ci -Am m -u "`(echo foo; echo bar3)`"

true