Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge-default @ 5435:d0c67b52ac01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: make contents of "extra" dict available from sources, for sinks. This breaks hash preservation for hg->hg conversion, as each converted change gets a convert_revision item added to its extra dict. Ugh.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 10 Oct 2007 15:30:00 -0700
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