view tests/test-merge-default @ 6049:348132c112cf

convert: improve gnu arch source performance and other fixes

- Improve performance by reading 'replay' output instead of
  calling 'delta' command after 'replay'. This increases speed
  significantly.

- Some times 'replay' command might fail with conflicts (don't
  know why), a new get from that revision just fixes it. So,
  if something fails, get a fresh copy from that revision and
  try from there.

#!/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