Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-flags @ 431:dfc44f3f587c
convert-repo fixups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
convert-repo fixups
- - deal with octopus merge
uniqueify parent list
add a series of identical commits with "(octopus merge fixup)"
- - add "committer" field from git to the commit message
manifest hash: e33d802afe35edecfc5cc9b567def6db2b0cb885
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCubogywK+sNU5EO8RAkWgAJ9OVHeumKd/nRIfvS/nQ9eSbORqNgCgpBIE
Dza0L59OSJHHmm3Dbp7ygds=
=OEvJ
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 22 Jun 2005 11:21:04 -0800 |
parents | 291a62848f54 |
children | 22b5aaeb3637 |
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 hg merge ../test2 | |
26 hg heads | |
27 hg history | |
28 | |
29 hg -dv co -m | |
30 | |
31 ls -l ../test[12]/a > foo | |
32 cut -b 0-10 < foo | |
33 |