default path support with .hg/hgrc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 default path support with .hg/hgrc hg init creates a new .hgrc file containing a default path pointing to where we pulled from. hg pull now uses "default" as the default source. manifest hash: 0908e3b0648f92a63a3b58e49107cedf07ca0fb4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr5SBywK+sNU5EO8RAmvRAKCPdItvtxYyAOgG24732J7PZMFnVgCfe21B MoilYzCQi5GOswS2mk0aE6M= =Gude -----END PGP SIGNATURE-----

#!/bin/bash

export HGMERGE=true

set -ex
mkdir r1
cd r1
hg init
echo a > a
hg addremove
hg commit -t "1" -u test -d "0 0"

cd ..
mkdir r2
cd r2
hg init ../r1
hg up
echo abc > a
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

cd ../r1
echo b > b
echo a2 > a
hg addremove
hg commit -t "2" -u test -d "0 0"

cd ../r2
hg -q pull ../r1
hg status
hg -d up
hg -d up -m
hg parents
hg -v history
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d