Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change @ 332:6c869059beb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
testing fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 testing fixups Add note about running tests to README Fix issue with pipelines and set -x output stability Add note about stability issue to README manifest hash: 7e8d9da463b3110664e24978550faab3ef67a706 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr0/FywK+sNU5EO8RAnWXAJ4toFrvgtsPfR3dYs9a81AsOrfiVQCfZKIf yJCboAnoJNSSjyUk42ALMxs= =YJ31 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 14 Jun 2005 13:44:37 -0800
parents 55f63f3b6a54
children b2293093b89e b4e0e20646bb
comparison
equal deleted inserted replaced
331:55f63f3b6a54 332:6c869059beb4
14 mkdir r2 14 mkdir r2
15 cd r2 15 cd r2
16 hg init ../r1 16 hg init ../r1
17 hg up 17 hg up
18 echo abc > a 18 echo abc > a
19 hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/" 19 hg diff > ../d
20 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
20 21
21 cd ../r1 22 cd ../r1
22 echo b > b 23 echo b > b
23 echo a2 > a 24 echo a2 > a
24 hg addremove 25 hg addremove
29 hg status 30 hg status
30 hg -d up 31 hg -d up
31 hg -d up -m 32 hg -d up -m
32 hg parents 33 hg parents
33 hg -v history 34 hg -v history
34 hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/" 35 hg diff > ../d
36 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
35 37