diff -r bfeff6dcac7a -r 4574a8cb080f tests/test-log.out --- a/tests/test-log.out Wed Mar 07 15:06:32 2007 +0100 +++ b/tests/test-log.out Fri Mar 09 18:09:02 2007 +0100 @@ -105,19 +105,22 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b1 % log -f -changeset: 3:e62f78d544b4 +changeset: 3:07a62f044f0d +branch: dummy tag: tip -parent: 1:3d5bf5654eda +parent: 1:fb3d4e35b279 user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: b1 -changeset: 1:3d5bf5654eda +changeset: 1:fb3d4e35b279 +branch: dummy user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: r1 -changeset: 0:67e992f2c4f3 +changeset: 0:ea445bfed6b9 +branch: dummy user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: base @@ -125,18 +128,21 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding b2 % log -f -r 1:tip -changeset: 1:3d5bf5654eda +changeset: 1:fb3d4e35b279 +branch: dummy user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: r1 -changeset: 2:60c670bf5b30 +changeset: 2:e8882cbc828c +branch: dummy user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: r2 -changeset: 3:e62f78d544b4 -parent: 1:3d5bf5654eda +changeset: 3:07a62f044f0d +branch: dummy +parent: 1:fb3d4e35b279 user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: b1 @@ -145,57 +151,66 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % log --follow-first -changeset: 6:2404bbcab562 +changeset: 6:0f621dafa603 +branch: dummy tag: tip user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: b1.1 -changeset: 5:302e9dd6890d -parent: 3:e62f78d544b4 -parent: 4:ddb82e70d1a1 +changeset: 5:0cf53fb6dfd5 +branch: dummy +parent: 3:07a62f044f0d +parent: 4:b76598590bc3 user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: m12 -changeset: 3:e62f78d544b4 -parent: 1:3d5bf5654eda +changeset: 3:07a62f044f0d +branch: dummy +parent: 1:fb3d4e35b279 user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: b1 -changeset: 1:3d5bf5654eda +changeset: 1:fb3d4e35b279 +branch: dummy user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: r1 -changeset: 0:67e992f2c4f3 +changeset: 0:ea445bfed6b9 +branch: dummy user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: base % log -P 2 -changeset: 6:2404bbcab562 +changeset: 6:0f621dafa603 +branch: dummy tag: tip user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: b1.1 -changeset: 5:302e9dd6890d -parent: 3:e62f78d544b4 -parent: 4:ddb82e70d1a1 +changeset: 5:0cf53fb6dfd5 +branch: dummy +parent: 3:07a62f044f0d +parent: 4:b76598590bc3 user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: m12 -changeset: 4:ddb82e70d1a1 -parent: 0:67e992f2c4f3 +changeset: 4:b76598590bc3 +branch: dummy +parent: 0:ea445bfed6b9 user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: b2 -changeset: 3:e62f78d544b4 -parent: 1:3d5bf5654eda +changeset: 3:07a62f044f0d +branch: dummy +parent: 1:fb3d4e35b279 user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: b1