rawcommit: do lookup of parents at the appropriate layer
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
rawcommit: do lookup of parents at the appropriate layer
manifest hash:
fc4b2d4416d00da5db2f4659e42ecba2a96dba1e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCu2UoywK+sNU5EO8RApdDAJ9Vph6qVyzL++YeXyFC8HKf9ZhkGgCeNc0Y
j2AMu6aWmuLuy2XwztS8gms=
=f8mQ
-----END PGP SIGNATURE-----
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