tests/test-up-local-change
author mpm@selenic.com
Wed, 15 Jun 2005 10:01:15 -0800
changeset 354 e3667e3a18ac
parent 350 b4e0e20646bb
child 485 c5705ab9cebd
permissions -rwxr-xr-x
hg commit: add -A flag -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg commit: add -A flag From: Chris Mason <mason@suse.com> Add hg commit -A that calls hg addremove before trying to run the commit manifest hash: d25cb3ab4e0dc2e8642bcbef32da4ab178cd4823 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsGzrywK+sNU5EO8RAvdFAJ46ZjyACMvKEUq8RmdxZB9ZE0z6ygCfYYzq UP2EXTOQ2pdhxKFyad8h/Rg= =wzZD -----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