Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-flags @ 413:a3b5347c22cd
remove double assignment
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
remove double assignment
spotted by Goffredo Baroncelli
manifest hash: a0406a618ce5b2b9b10073b29960d594094aa3ed
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuNXhywK+sNU5EO8RAh9yAJ0aVTnxsumDAdF3JORp1pDebxeE8wCgisdG
vf/JwxHbQEqGrefU1nbs928=
=NDGW
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 19:07:13 -0800 |
parents | 40cfa2d0c088 |
children | 291a62848f54 |
rev | line source |
---|---|
412 | 1 #!/bin/sh +ex |
2 | |
3 mkdir test1 | |
4 cd test1 | |
5 | |
6 hg init | |
7 touch a b | |
8 hg add a b | |
9 hg ci -t "added a b" -u test -d "0 0" | |
10 | |
11 cd .. | |
12 mkdir test2 | |
13 cd test2 | |
14 | |
15 hg init | |
16 hg merge ../test1 | |
17 hg co | |
18 chmod +x a | |
19 hg ci -t "chmod +x a" -u test -d "0 0" | |
20 | |
21 cd ../test1 | |
22 echo 123 >>a | |
23 hg ci -t "a updated" -u test -d "0 0" | |
24 | |
25 ls -l ../test[12]/a | |
26 | |
27 hg merge ../test2 | |
28 hg heads | |
29 hg history | |
30 | |
31 hg -dv co -m | |
32 | |
33 ls -l ../test[12]/a > foo | |
34 cut -b 0-10 < foo | |
35 |