Mercurial > hg > mercurial-crew-with-dirclash
view tests/manifest-bug @ 238:3b92f8fe47ae
hgweb.py: kill #! line, clean up copyright notice
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hgweb.py: kill #! line, clean up copyright notice
manifest hash: a2910abe3f58687ccf55179ab37f66dee2b6e775
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoM71ywK+sNU5EO8RAil4AJ9edZ1FJ0WbikVBYBMNO+MldBRqnACfRtuH
Nw/BuBueQfEhaI3i+9+Q9/g=
=vV8+
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 13:43:17 -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