Mercurial > hg
comparison tests/test-convert-git.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 | a5a7f7fd5554 |
children | 3667b6e4bbd0 |
comparison
equal
deleted
inserted
replaced
5404:67d3daa8ac42 | 5405:8feb33c2d153 |
---|---|
42 | | | 42 | | |
43 | o 1 "change foo" files: foo | 43 | o 1 "change foo" files: foo |
44 |/ | 44 |/ |
45 o 0 "add foo" files: foo | 45 o 0 "add foo" files: foo |
46 | 46 |
47 245a3b8bc653999c2b22cdabd517ccb47aecafdf 644 bar | 47 245a3b8bc653999c2b22cdabd517ccb47aecafdf 644 bar |
48 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz | 48 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz |
49 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo | 49 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo |
50 88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux | 50 88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux |
51 % foo bar baz: octopus merge | 51 % foo bar baz: octopus merge |
52 o 8 "Discard change to foo" files: foo | 52 o 8 "Discard change to foo" files: foo |
53 |\ | 53 |\ |
54 | o 7 "change foo" files: foo | 54 | o 7 "change foo" files: foo |
55 | | | 55 | | |
65 | | | 65 | | |
66 | o 1 "change foo" files: foo | 66 | o 1 "change foo" files: foo |
67 |/ | 67 |/ |
68 o 0 "add foo" files: foo | 68 o 0 "add foo" files: foo |
69 | 69 |
70 245a3b8bc653999c2b22cdabd517ccb47aecafdf 644 bar | 70 245a3b8bc653999c2b22cdabd517ccb47aecafdf 644 bar |
71 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz | 71 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz |
72 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo | 72 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo |
73 % foo baz quux: only some parents of an octopus merge; "discard" a head | 73 % foo baz quux: only some parents of an octopus merge; "discard" a head |
74 o 6 "Discard change to foo" files: foo | 74 o 6 "Discard change to foo" files: foo |
75 | | 75 | |
76 o 5 "change foo" files: foo | 76 o 5 "change foo" files: foo |
77 | | 77 | |
83 | | | 83 | | |
84 o | 1 "change foo" files: foo | 84 o | 1 "change foo" files: foo |
85 |/ | 85 |/ |
86 o 0 "add foo" files: foo | 86 o 0 "add foo" files: foo |
87 | 87 |
88 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz | 88 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz |
89 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo | 89 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo |
90 88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux | 90 88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux |