Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change @ 349:b2293093b89e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with mercurial-identify (which includes upstream's current tip) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merged with mercurial-identify (which includes upstream's current tip) manifest hash: b135d201757b84bbe7f14a446d2b001fd0cc1aa2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCr9mNW7P1GVgWeRoRAmTjAJ919wnvZXbKI27N0cDJCrumR3z4rQCcD6PO yZTmrT6p+gt6GBO+j5FVBn0= =HWn8 -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 15 Jun 2005 08:32:29 +0100
parents 6c869059beb4
children b4e0e20646bb
comparison
equal deleted inserted replaced
348:442eb02cf870 349:b2293093b89e
1 #!/bin/bash
2
3 export HGMERGE=true
4
5 set -ex
6 mkdir r1
7 cd r1
8 hg init
9 echo a > a
10 hg addremove
11 hg commit -t "1" -u test -d "0 0"
12
13 cd ..
14 mkdir r2
15 cd r2
16 hg init ../r1
17 hg up
18 echo abc > a
19 hg diff > ../d
20 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
21
22 cd ../r1
23 echo b > b
24 echo a2 > a
25 hg addremove
26 hg commit -t "2" -u test -d "0 0"
27
28 cd ../r2
29 hg -q pull ../r1
30 hg status
31 hg -d up
32 hg -d up -m
33 hg parents
34 hg -v history
35 hg diff > ../d
36 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
37