Mercurial > hg

view tests/test-merge-default @ 3078:baa3873eb387

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't let lazyparser read more data than it can handle This should fix issue368.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 10 Sep 2006 19:15:08 -0300
parents 013921c753bd
children 9cd6578750b9
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 1 head
hg merge

true