view tests/test-issue619 @ 5526:d5b9c74c910e

httprepo: give self._url and the netloc to the password manager This should hide some differences between different python versions.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 09 Nov 2007 20:21:35 -0200
parents 8808ea7da86b
children 4c94b6d0fb1c
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done