view tests/test-fetch @ 5227:a1efa71f3ece

Improve extdiff configuration. In addition to the old cmd.foo, opts.foo hgrc entries, allow a more simple alias = command [opts]... form. For example: [extdiff] cdiff = colordiff -uprN
author Brendan Cully <brendan@kublai.com>
date Sat, 25 Aug 2007 12:25:53 -0700
parents 61fcd9fac434
children
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