Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge-default @ 5465:9873cbb134b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial.el, mq.el: remove runtime dependencies on CL package * (require 'cl) at compile-time * don't use map()
author NIIMI Satoshi <sa2c@sa2c.net>
date Thu, 11 Oct 2007 05:58:54 +0900
parents 9cd6578750b9
children
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