tests/test-conflict
author Matt Mackall <mpm@selenic.com>
Sun, 22 Jul 2007 14:53:57 -0500
changeset 4970 30d4d8985dd8
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
transactions: avoid late tear-down (issue641) We use weak references (ugh) to avoid having to manually delete transaction references out of each call frame when an exception occurs.

#!/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"
hg merge 1
hg id
cat a
hg status