##// END OF EJS Templates
Add a fast binary diff extension (not yet used)...
Add a fast binary diff extension (not yet used) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a fast binary diff extension (not yet used) manifest hash: fbfdcab2b1f4856af45176fcf2423d602dfe88c4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuL6eywK+sNU5EO8RAoT+AJ95z9gx2IrucBS30CnCQFkZT7lSbgCgnXh5 ScZcgwzJ/mEo9i5vuKNlCIs= =Gr58 -----END PGP SIGNATURE-----

File last commit:

r350:b4e0e206 merge default
r400:8b067bde default
Show More
test-up-local-change
37 lines | 456 B | text/plain | TextLexer
/ tests / test-up-local-change
mpm@selenic.com
Add a simple testing framework...
r331 #!/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
mpm@selenic.com
testing fixups...
r332 hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
mpm@selenic.com
Add a simple testing framework...
r331
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
mpm@selenic.com
testing fixups...
r332 hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
mpm@selenic.com
Add a simple testing framework...
r331