view tests/test-issue842 @ 11976:b28fc3b3efd6

tests: unify test-merge2
author Pradeepkumar Gayam <in3xes@gmail.com>
date Wed, 18 Aug 2010 05:09:58 +0530
parents cb93eee1fbcd
children
line wrap: on
line source

#!/bin/sh

hg init test
cd test
echo foo > a
hg ci -Ama

hg up -r0000
echo bar > a
echo % should issue warning
hg ci -Amb

hg up -r0000
echo stuffy > a
echo % should not issue warning
hg ci -q -Amc

hg up -r0000
echo crap > a
hg branch testing
echo % should not issue warning
hg ci -q -Amd