Mercurial > hg > mercurial-crew-with-dirclash
view tests/manifest-bug @ 243:9a9ea2d1d3c4
fix heads for rev 0
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
fix heads for rev 0
manifest hash: 7b2f4607f6c54b660d63ac35ba953576464e1511
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCofyyywK+sNU5EO8RAjkeAJ4rfOQ9HV+gpndsTzuoS6R3f+mzEQCfcb0P
IWhTz6XDpTWEkjzcK++mZ4k=
=mINY
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sat, 04 Jun 2005 11:10:42 -0800 |
parents | 9f64ee817199 |
children |
line wrap: on
line source
#!/bin/sh -x set +e BASE=foo.base BR1=foo.br1 BR2=foo.br2 BR2_1=foo.br2_1 mkdir $BASE cd $BASE hg init echo test > file hg add file EDITOR="echo 'initial commit' > " hg commit cd .. mkdir $BR1 cd $BR1 hg branch ../$BASE hg checkout echo test > file1 hg addremove EDITOR="echo side commit >" hg commit cd .. mkdir $BR2 cd $BR2 hg branch ../$BASE hg checkout echo yet more >> file2 hg addremove EDITOR="echo second update >" hg commit cd .. mkdir $BR2_1 cd $BR2_1 hg branch ../$BR2 hg checkout EDITOR="echo commit merge >" hg merge ../$BR1 hg checkout