Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge7.out @ 1933:7544700fd931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 13 Mar 2006 13:05:41 +0100
parents 6d50d6189269
children ced2d3620f95
comparison
equal deleted inserted replaced
1932:82995896d5af 1933:7544700fd931
37 0 0 7 0 0 01365c4cca56 000000000000 000000000000 37 0 0 7 0 0 01365c4cca56 000000000000 000000000000
38 1 7 9 1 1 7b013192566a 01365c4cca56 000000000000 38 1 7 9 1 1 7b013192566a 01365c4cca56 000000000000
39 2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000 39 2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000
40 3 31 27 2 3 fc3148072371 7b013192566a 8fe46a3eb557 40 3 31 27 2 3 fc3148072371 7b013192566a 8fe46a3eb557
41 4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000 41 4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000
42 changeset: 4:40d11a4173a8 42 changeset: 4:a070d41e8360
43 tag: tip 43 tag: tip
44 parent: 2:96b70246a118 44 parent: 2:faaea63e63a9
45 user: test 45 user: test
46 date: Thu Jan 1 00:00:00 1970 +0000 46 date: Mon Jan 12 13:46:40 1970 +0000
47 summary: two -> two-point-one 47 summary: two -> two-point-one
48 48
49 changeset: 3:50c3a7e29886 49 changeset: 3:451c744aabcc
50 parent: 1:d1e159716d41 50 parent: 1:e409be6afcc0
51 parent: 2:96b70246a118 51 parent: 2:faaea63e63a9
52 user: test 52 user: test
53 date: Thu Jan 1 00:00:00 1970 +0000 53 date: Mon Jan 12 13:46:40 1970 +0000
54 summary: Merge 1 54 summary: Merge 1
55 55
56 changeset: 2:96b70246a118 56 changeset: 2:faaea63e63a9
57 parent: 0:b1832b9d912a 57 parent: 0:095c92b91f1a
58 user: test 58 user: test
59 date: Thu Jan 1 00:00:00 1970 +0000 59 date: Mon Jan 12 13:46:40 1970 +0000
60 summary: Numbers as words 60 summary: Numbers as words
61 61
62 changeset: 1:d1e159716d41 62 changeset: 1:e409be6afcc0
63 user: test 63 user: test
64 date: Thu Jan 1 00:00:00 1970 +0000 64 date: Mon Jan 12 13:46:40 1970 +0000
65 summary: 2 -> 2.5 65 summary: 2 -> 2.5
66 66
67 changeset: 0:b1832b9d912a 67 changeset: 0:095c92b91f1a
68 user: test 68 user: test
69 date: Thu Jan 1 00:00:00 1970 +0000 69 date: Mon Jan 12 13:46:40 1970 +0000
70 summary: Initial 70 summary: Initial
71 71