Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-excessive-merge.out @ 5405:8feb33c2d153
Display symlink or executable bit with manifest -v
New output looks like:
644 a
755 * b/a
644 @ l
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 06 Oct 2007 22:30:22 +0200 |
parents | b2ae81a7df29 |
children |
comparison
equal
deleted
inserted
replaced
5404:67d3daa8ac42 | 5405:8feb33c2d153 |
---|---|
41 2 132 68 2 2 7c5dc2e857f2 dc1751ec2e9d 000000000000 | 41 2 132 68 2 2 7c5dc2e857f2 dc1751ec2e9d 000000000000 |
42 3 200 75 3 3 13d875a22764 7c5dc2e857f2 448a8c5e42f1 | 42 3 200 75 3 3 13d875a22764 7c5dc2e857f2 448a8c5e42f1 |
43 4 275 29 3 4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2 | 43 4 275 29 3 4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2 |
44 | 44 |
45 1 | 45 1 |
46 79d7492df40aa0fa093ec4209be78043c181f094 644 a | 46 79d7492df40aa0fa093ec4209be78043c181f094 644 a |
47 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b | 47 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b |
48 2 | 48 2 |
49 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a | 49 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a |
50 79d7492df40aa0fa093ec4209be78043c181f094 644 b | 50 79d7492df40aa0fa093ec4209be78043c181f094 644 b |
51 3 | 51 3 |
52 79d7492df40aa0fa093ec4209be78043c181f094 644 a | 52 79d7492df40aa0fa093ec4209be78043c181f094 644 a |
53 79d7492df40aa0fa093ec4209be78043c181f094 644 b | 53 79d7492df40aa0fa093ec4209be78043c181f094 644 b |
54 4 | 54 4 |
55 79d7492df40aa0fa093ec4209be78043c181f094 644 a | 55 79d7492df40aa0fa093ec4209be78043c181f094 644 a |
56 79d7492df40aa0fa093ec4209be78043c181f094 644 b | 56 79d7492df40aa0fa093ec4209be78043c181f094 644 b |
57 | 57 |
58 rev offset length base linkrev nodeid p1 p2 | 58 rev offset length base linkrev nodeid p1 p2 |
59 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 | 59 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 |
60 1 5 6 1 1 79d7492df40a 2ed2a3912a0b 000000000000 | 60 1 5 6 1 1 79d7492df40a 2ed2a3912a0b 000000000000 |
61 checking changesets | 61 checking changesets |