Mercurial > hg

view tests/test-merge-default @ 6487:9e3bddb5fae2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg.1: bogus escaping of .hg* not needed anymore Revert ba40e267762b, 1c1ef561d541 workarounds.
author Christian Ebert <blacktrash@gmx.net>
date Sun, 06 Apr 2008 13:13:31 +0200
parents 9cd6578750b9
children 50b6af595e0c
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
hg commit -mm2

echo % should fail because at tip
hg merge

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

true