Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-flags.out @ 793:445970ccf57a
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 06:43:21 +0100 |
parents | 7e4843b7efd2 853bfbf1a312 |
children | 1f9ec150a476 |
line wrap: on
line diff
--- a/tests/test-flags.out +++ b/tests/test-flags.out @@ -14,8 +14,8 @@ pulling from ../test1 requesting all changes adding changesets adding manifests -adding file revisions -modified 2 files, added 1 changesets and 2 new revisions +adding file changes +added 1 changesets with 2 changes to 2 files (run 'hg update' to get a working copy) + hg co + chmod +x a @@ -28,36 +28,36 @@ pulling from ../test2 searching for changes adding changesets adding manifests -adding file revisions -modified 1 files, added 1 changesets and 1 new revisions +adding file changes +added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) + hg heads -changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 +changeset: 2:3ef543305655 tag: tip -parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 +parent: 0:22a449e20da5 user: test date: Thu Jan 1 00:00:00 1970 summary: chmod +x a -changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 +changeset: 1:c6ecefc45368 user: test date: Thu Jan 1 00:00:00 1970 summary: a updated + hg history -changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 +changeset: 2:3ef543305655 tag: tip -parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 +parent: 0:22a449e20da5 user: test date: Thu Jan 1 00:00:00 1970 summary: chmod +x a -changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 +changeset: 1:c6ecefc45368 user: test date: Thu Jan 1 00:00:00 1970 summary: a updated -changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 +changeset: 0:22a449e20da5 user: test date: Thu Jan 1 00:00:00 1970 summary: added a b