filelog: add metadata support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 filelog: add metadata support To add metadata, we add an escape sequence "\1\n" to indicate that some key:value metadata pairs follow. manifest hash: 9a019d50f8d389b2c16cb46f4eab62c136b70fd7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsJfFywK+sNU5EO8RAl1AAJ9BJPgDWnot5MUdPnzPiNxlyhG0rACfVo10 6q9fGaPUpf8mxefz7G8D0Z0= =1BL6 -----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