view tests/test-merge-default @ 3569:a27d90c9336e

Stripping of query string (since 88b4755fa48f) stripped too much (issue327)

rstrip(qs) not only strips qs from the right, but it continues stripping
every char at the end of the URL that occurs on qs.

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