mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
c6129ace2e
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 options: kill -d for debug You must now use --debug. This is a preparatory step for changing the option parsing from: hg [global-opts] <command> [command-opts] to hg [global-opts] <command> [global or command opts] manifest hash: ec5ecc687340baa109a98b742f1cd8d1f4aadeed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx4urywK+sNU5EO8RAl90AJ0fwKU/GwHpJvlTFl5naeJbkceWewCgh4jK kaTSSodACgPzgbFiid5RL4Y= =siEe -----END PGP SIGNATURE-----
36 lines
455 B
Bash
Executable File
36 lines
455 B
Bash
Executable File
#!/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
|
|
|