Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-rawcommit1.out @ 547:4fc63e22b1fe
Merge with TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with TAH
manifest hash: 1742d7ba2093dc643b57e45167cb2d794212cbb9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxPCQywK+sNU5EO8RAkr0AJ9qut/31lCLQ/xY3FWaF3c21RhS7wCfW1eV
3WexPDsJldMAr3V5vc9eowA=
=pJYu
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Thu, 30 Jun 2005 23:28:16 -0800 |
parents | e94cebc60d96 c8ae964109c1 |
children | eb46971fc57f |
line wrap: on
line diff
--- a/tests/test-rawcommit1.out +++ b/tests/test-rawcommit1.out @@ -28,6 +28,7 @@ files+: c description: 2 + + rm b + hg -d rawcommit -p 2 -d '0 0' -u user -t3 b + hg -d manifest 3 @@ -45,6 +46,7 @@ files-: b description: 3 + + echo this is a22 + hg -d rawcommit -p 3 -d '0 0' -u user -t4 a + hg -d manifest 4 @@ -62,6 +64,7 @@ files: a description: 4 + + echo this is c22 + hg -d rawcommit -p 1 -d '0 0' -u user -t5 c + hg -d manifest 5 @@ -79,6 +82,7 @@ files: a description: 4 + + hg -d rawcommit -p 4 -p 5 -d '0 0' -u user -t6 + hg -d manifest 6 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a @@ -94,6 +98,7 @@ date: Thu Jan 1 00:00:00 1970 description: 6 + + hg -d rawcommit -p 6 -d '0 0' -u user -t7 + hg -d manifest 7 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a @@ -109,3 +114,4 @@ date: Thu Jan 1 00:00:00 1970 description: 7 +