view tests/test-merge5 @ 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

mkdir t
cd t
hg init
echo This is file a1 > a
echo This is file b1 > b
hg add a b
hg commit -m "commit #0" -d "1000000 0"
echo This is file b22 > b
hg commit -m"comment #1" -d "1000000 0"
hg update 0
rm b
hg commit -A -m"comment #2" -d "1000000 0"
# in theory, we shouldn't need the "-y" below, but it prevents
# this test from hanging when "hg update" erroneously prompts the
# user for "keep or delete"
hg update -y 1

exit 0