Mercurial > hg > mercurial-crew-with-dirclash
view tests/manifest-bug @ 347:a0b2758edee7
Cleaned up show_changeset()
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Cleaned up show_changeset()
manifest hash: f9aa30cfa465d7aa096abb652ec04f1a5ec1072f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCroC+W7P1GVgWeRoRAuheAJsEx7eFaoHoz+YejLIiN4BSfE117ACfYdM6
NQGNTp3ftUSuVpcMLvV8A1U=
=8Ihb
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 14 Jun 2005 08:01:18 +0100 |
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