Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-flags.out @ 456:d6ac88a738c4
More FAQ bits.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
More FAQ bits.
manifest hash: dd8aa534d3e72aa33f4fd7270d3750cefc2c40a9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCu54aywK+sNU5EO8RAud5AJ4699rQiuiZ2TKdZzkG6iGU/UaG8wCgr4Jz
euPp7E7arLNoOYtzCbGCSks=
=l3sX
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Thu, 23 Jun 2005 21:46:02 -0800 |
parents | 291a62848f54 |
children | 66eb9905d0a2 e94cebc60d96 |
line wrap: on
line source
pulling from ../test1 requesting all changes adding changesets adding manifests adding file revisions modified 2 files, added 1 changesets and 2 new revisions (run 'hg update' to get a working copy) pulling from ../test2 searching for changes adding changesets adding manifests adding file revisions modified 1 files, added 1 changesets and 1 new revisions (run 'hg update' to get a working copy) changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 tag: tip parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 user: test date: Thu Jan 1 00:00:00 1970 summary: chmod +x a changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 user: test date: Thu Jan 1 00:00:00 1970 summary: a updated changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 tag: tip parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 user: test date: Thu Jan 1 00:00:00 1970 summary: chmod +x a changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 user: test date: Thu Jan 1 00:00:00 1970 summary: a updated changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 user: test date: Thu Jan 1 00:00:00 1970 summary: added a b resolving manifests ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e a versions differ, resolve merging a resolving a file a: other 37c42bd6cc03 ancestor b80de5d13875 -rwxr-xr-x -rwxr-xr-x