tests/test-conflict
author Renato Cunha <renatoc@gmail.com>
Wed, 14 Jul 2010 22:58:29 -0300
changeset 11564 9bbfeba33aa3
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
record: removed 'has_key' usage Py3k has removed the dictionary has_key method. This patch implements a one argument function that can be used as a callback by hg.revert in the record extension.

#!/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