view tests/test-conflict @ 10716:5f92bde72eef

check-code: Only call check-code if __name__ = "__main__". This changeset moves the code that actually executes something to the "if __name__ = '__main__'" section to allow the file to be imported as a module.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Tue, 16 Mar 2010 19:52:56 +0100
parents 93a4e72b4f83
children
line wrap: on
line source

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