Mercurial > hg

view tests/test-merge-default @ 9834:655ac26ad63e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgignore.5: fix typo
author Martin Geisler <mg@lazybytes.net>
date Wed, 11 Nov 2009 21:29:35 +0100
parents 6d36fc70754e
children a5576908b589
line wrap: on
line source

#!/bin/sh

hg init
echo a > a
hg commit -A -ma

echo a >> a
hg commit -mb

echo a >> a
hg commit -mc

hg up 1
echo a >> a
hg commit -md

hg up 1
echo a >> a
hg commit -me

hg up 1
echo % should fail because not at a head
hg merge

hg up
echo % should fail because \> 2 heads
hg merge

echo % should succeed
hg merge 2
hg commit -mm1

echo % should succeed - 2 heads
hg merge -P
hg merge
hg commit -mm2

echo % should fail because at tip
hg merge

hg up 0
echo % should fail because 1 head
hg merge

true