Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge-default @ 3071:be98c5ce4022

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: do not shell-quote options to new commands revert a change introduced by 453097750fbf
author TK Soh <teekaysoh@yahoo.com>
date Mon, 28 Aug 2006 16:30:48 -0500
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