Mercurial > hg > gitweb

comparison tests/test-rawcommit1.out @ 993:6f274afc05c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases
author mpm@selenic.com
date Tue, 23 Aug 2005 02:19:38 -0700
parents 4f81068ed8cd
children dbb8bba48510
comparison
equal deleted inserted replaced
992:f859e9cba1b9 993:6f274afc05c7
9 date: Thu Jan 1 00:00:00 1970 +0000 9 date: Thu Jan 1 00:00:00 1970 +0000
10 summary: 2 10 summary: 2
11 11
12 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a 12 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
13 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c 13 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
14 changeset: 3:c8225a106186 14 changeset: 3:142428fbbcc5
15 tag: tip 15 tag: tip
16 user: test 16 user: test
17 date: Thu Jan 1 00:00:00 1970 +0000 17 date: Thu Jan 1 00:00:00 1970 +0000
18 summary: 3 18 summary: 3
19 19
20 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a 20 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
21 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c 21 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
22 changeset: 4:8dfeee82a94b 22 changeset: 4:4d450f9aa680
23 tag: tip 23 tag: tip
24 user: test 24 user: test
25 date: Thu Jan 1 00:00:00 1970 +0000 25 date: Thu Jan 1 00:00:00 1970 +0000
26 summary: 4 26 summary: 4
27 27
28 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a 28 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
29 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b 29 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
30 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c 30 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
31 changeset: 4:8dfeee82a94b 31 changeset: 4:4d450f9aa680
32 user: test 32 user: test
33 date: Thu Jan 1 00:00:00 1970 +0000 33 date: Thu Jan 1 00:00:00 1970 +0000
34 summary: 4 34 summary: 4
35 35
36 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a 36 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
37 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c 37 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
38 changeset: 6:c0e932ecae5e 38 changeset: 6:b4b8b9afa8cc
39 tag: tip 39 tag: tip
40 parent: 4:8dfeee82a94b 40 parent: 4:4d450f9aa680
41 parent: 5:a7925a42d0df 41 parent: 5:a7925a42d0df
42 user: test 42 user: test
43 date: Thu Jan 1 00:00:00 1970 +0000 43 date: Thu Jan 1 00:00:00 1970 +0000
44 summary: 6 44 summary: 6
45 45
46 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a 46 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
47 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c 47 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
48 changeset: 7:3a157da4365d 48 changeset: 7:f84d0b1b024e
49 tag: tip 49 tag: tip
50 user: test 50 user: test
51 date: Thu Jan 1 00:00:00 1970 +0000 51 date: Thu Jan 1 00:00:00 1970 +0000
52 summary: 7 52 summary: 7
53 53