tests/test-conflict
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 17 Mar 2007 18:46:52 +0100
changeset 4238 ce6c364ebb2a
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
Fix issue443: inconsistent output of "hg qunapplied -v" 1. Don't skip over unpushable (guarded) unapplied patches. 2. Don't display unpushable patches, unless -v is given, otherwise guarded and unguarded patches can't be distinguished.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
HGMERGE=merge; export HGMERGE
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status