view tests/test-merge-default @ 4743:cc0fb3500dd5

mercurial.spec: include various utility files from contrib/ in rpm Files included: hgk convert-repo hg-ssh hg-viz git-rev-tree bash_completion zsh_completion mercurial.el
author Adam Spiers <hg@adamspiers.org>
date Sun, 03 Jun 2007 14:40:56 +0100
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