tests/test-586
author Patrick Mezard <pmezard@gmail.com>
Tue, 11 Sep 2007 23:04:42 +0200
changeset 5298 cba2a689117d
parent 4535 720ae5085ee3
child 7564 f1af59451c0c
permissions -rwxr-xr-x
parents: make it match the doc when called on a file parents used to return the parent revision of the last revision updating selected file, instead of the updating revision itself.

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A