[PATCH] Update hgit to the new commands.dodiff parameters
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Update hgit to the new commands.dodiff parameters
From: Chris Mason <mason@suse.com>
Update hgit to the new commands.dodiff parameters
manifest hash: aa8d98036fae49ab1c1c0e65d86ab0e1bee0fa71
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsG35ywK+sNU5EO8RAhnoAJwMgK1QA8DkdbU2R19LoLRK1fmCaQCeN1dh
4fHRT4hf+Qi5fND4CpOyqBU=
=63xo
-----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