Mercurial > hg

view tests/test-up-local-change @ 682:d6723636c172

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert hgeditor md5sum change -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Revert hgeditor md5sum change My copy of md5sum doesn't do --status manifest hash 509a316ca72aca095c590fb120eb2ee8260814dd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC01pKywK+sNU5EO8RAkDWAJ0dWHz3Vp5oR2be9k3d1Km2Br53xgCgrBLF Ja2tOYCu/nP4sh3CsOsIO78= =zHkj -----END PGP SIGNATURE-----
author Matt Mackall <mpm@selenic.com>
date Mon, 11 Jul 2005 21:51:06 -0800
parents eb46971fc57f
children 7e4843b7efd2
line wrap: on
line source

#!/bin/sh

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"

hg clone . ../r2
cd ../r2
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 --debug up
hg --debug up -m
hg parents
hg -v history
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d