Mercurial > hg > mercurial-crew-with-dirclash
view 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 |
line wrap: on
line source
#!/bin/sh +ex mkdir test1 cd test1 hg init touch a b hg add a b hg ci -t "added a b" -u test -d "0 0" cd .. mkdir test2 cd test2 hg init hg merge ../test1 hg co chmod +x a hg ci -t "chmod +x a" -u test -d "0 0" cd ../test1 echo 123 >>a hg ci -t "a updated" -u test -d "0 0" hg merge ../test2 hg heads hg history hg -dv co -m ls -l ../test[12]/a > foo cut -b 0-10 < foo