view tests/test-fetch @ 5318:c6682cdada2f

Test renaming files brought by merge second parent (issue 746)
author Patrick Mezard <pmezard@gmail.com>
date Sun, 23 Sep 2007 14:40:44 +0200
parents 61fcd9fac434
children 86f5d8f608b7
line wrap: on
line source

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "fetch=" >> $HGRCPATH

hg init a
echo a > a/a
hg --cwd a commit -d '1 0' -Ama

hg clone a b
hg clone a c

echo b > a/b
hg --cwd a commit -d '2 0' -Amb
hg --cwd a parents -q

echo % should pull one change
hg --cwd b fetch ../a
hg --cwd b parents -q

echo c > c/c
hg --cwd c commit -d '3 0' -Amc
hg --cwd c fetch -d '4 0' -m 'automated merge' ../a
ls c