view tests/test-merge-default @ 4195:e8ee8fdeddb1

change locate to use relglobs by default This makes its default behaviour useful again (issue108), and changes it search the entire repository by default (instead of just the cwd), just like all other commands. It also hides issue204 by default, but you'll still see the same behaviour if you give it a relpath: pattern.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 10 Mar 2007 23:00:57 -0300
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