Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change @ 591:eb46971fc57f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
options: kill -d for debug -----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-----
author mpm@selenic.com
date Sat, 02 Jul 2005 22:54:35 -0800
parents 4fc63e22b1fe
children 7e4843b7efd2
comparison
equal deleted inserted replaced
590:38d106db75bc 591:eb46971fc57f
24 hg commit -t "2" -u test -d "0 0" 24 hg commit -t "2" -u test -d "0 0"
25 25
26 cd ../r2 26 cd ../r2
27 hg -q pull ../r1 27 hg -q pull ../r1
28 hg status 28 hg status
29 hg -d up 29 hg --debug up
30 hg -d up -m 30 hg --debug up -m
31 hg parents 31 hg parents
32 hg -v history 32 hg -v history
33 hg diff > ../d 33 hg diff > ../d
34 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d 34 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
35 35