annotate tests/test-convert-filemap.out @ 10712:fbe138da6b38

keyword: 1 variable name for overwriting candidates
author Christian Ebert <blacktrash@gmx.net>
date Tue, 16 Mar 2010 22:28:23 +0100
parents f2618cacb485
children 7fefef3ce791
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 5405
diff changeset
1 created new head
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 5405
diff changeset
2 created new head
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
3 @ 8 "8: change foo" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
4 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
5 o 7 "7: second merge; change bar" files: bar baz
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
6 |\
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
7 | o 6 "6: change foo baz" files: baz foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
8 | |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
9 o | 5 "5: change bar baz quux" files: bar baz quux
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
10 |/
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
11 o 4 "4: first merge; change bar baz" files: bar baz
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
12 |\
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
13 | o 3 "3: change bar quux" files: bar quux
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
14 | |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
15 o | 2 "2: change foo" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
16 |/
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
17 o 1 "1: add bar quux; copy foo to copied" files: bar copied quux
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
18 |
9885
b1addc725998 test-convert-filemap: test improved filtering algorithm
Patrick Mezard <pmezard@gmail.com>
parents: 6737
diff changeset
19 o 0 "0: add foo baz dir/" files: baz dir/file dir/file2 dir/subdir/file3 dir/subdir/file4 foo
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
20
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
21 % final file versions in this repo:
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
22 9463f52fe115e377cf2878d4fc548117211063f2 644 bar
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
23 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 9885
diff changeset
24 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
25 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
26 75e6d3f8328f5f6ace6bf10b98df793416a09dca 644 dir/file2
9885
b1addc725998 test-convert-filemap: test improved filtering algorithm
Patrick Mezard <pmezard@gmail.com>
parents: 6737
diff changeset
27 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir/subdir/file3
b1addc725998 test-convert-filemap: test improved filtering algorithm
Patrick Mezard <pmezard@gmail.com>
parents: 6737
diff changeset
28 57a1c1511590f3de52874adfa04effe8a77d64af 644 dir/subdir/file4
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
29 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
30 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
31 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
32
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
33 % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd
6737
7239e06e58e9 context: consistently return p1 context for None
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
34 @ 3 "8: change foo" files: foo
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
35 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
36 o 2 "6: change foo baz" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
37 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
38 o 1 "2: change foo" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
39 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
40 o 0 "0: add foo baz dir/" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
41
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
42 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
43 % bar: merges are not merges anymore
6737
7239e06e58e9 context: consistently return p1 context for None
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
44 @ 4 "7: second merge; change bar" files: bar
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
45 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
46 o 3 "5: change bar baz quux" files: bar
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
47 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
48 o 2 "4: first merge; change bar baz" files: bar
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
49 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
50 o 1 "3: change bar quux" files: bar
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
51 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
52 o 0 "1: add bar quux; copy foo to copied" files: bar
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
53
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
54 9463f52fe115e377cf2878d4fc548117211063f2 644 bar
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
55 % baz: 1st merge is not a merge anymore; 2nd still is
6737
7239e06e58e9 context: consistently return p1 context for None
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
56 @ 4 "7: second merge; change bar" files: baz
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
57 |\
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
58 | o 3 "6: change foo baz" files: baz
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
59 | |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
60 o | 2 "5: change bar baz quux" files: baz
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
61 |/
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
62 o 1 "4: first merge; change bar baz" files: baz
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
63 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
64 o 0 "0: add foo baz dir/" files: baz
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
65
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
66 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
67 % foo quux: we add additional merges when they are interesting
6737
7239e06e58e9 context: consistently return p1 context for None
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
68 @ 8 "8: change foo" files: foo
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
69 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
70 o 7 "7: second merge; change bar" files:
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
71 |\
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
72 | o 6 "6: change foo baz" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
73 | |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
74 o | 5 "5: change bar baz quux" files: quux
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
75 |/
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
76 o 4 "4: first merge; change bar baz" files:
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
77 |\
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
78 | o 3 "3: change bar quux" files: quux
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
79 | |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
80 o | 2 "2: change foo" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
81 |/
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
82 o 1 "1: add bar quux; copy foo to copied" files: quux
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
83 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
84 o 0 "0: add foo baz dir/" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
85
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
86 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
87 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
88 % bar quux: partial conversion
6737
7239e06e58e9 context: consistently return p1 context for None
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
89 @ 1 "3: change bar quux" files: bar quux
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
90 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
91 o 0 "1: add bar quux; copy foo to copied" files: bar quux
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
92
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
93 b79105bedc55102f394e90a789c9c380117c1b4a 644 bar
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
94 db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
95 % bar quux: complete the partial conversion
6737
7239e06e58e9 context: consistently return p1 context for None
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
96 @ 4 "7: second merge; change bar" files: bar
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
97 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
98 o 3 "5: change bar baz quux" files: bar quux
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
99 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
100 o 2 "4: first merge; change bar baz" files: bar
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
101 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
102 o 1 "3: change bar quux" files: bar quux
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
103 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
104 o 0 "1: add bar quux; copy foo to copied" files: bar quux
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
105
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
106 9463f52fe115e377cf2878d4fc548117211063f2 644 bar
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
107 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
108 % foo: partial conversion
6737
7239e06e58e9 context: consistently return p1 context for None
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
109 @ 0 "0: add foo baz dir/" files: foo
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
110
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
111 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
112 % foo: complete the partial conversion
6737
7239e06e58e9 context: consistently return p1 context for None
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
113 @ 3 "8: change foo" files: foo
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
114 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
115 o 2 "6: change foo baz" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
116 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
117 o 1 "2: change foo" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
118 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
119 o 0 "0: add foo baz dir/" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
120
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
121 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
122 % copied: copied file; source not included in new repo
6737
7239e06e58e9 context: consistently return p1 context for None
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
123 @ 0 "1: add bar quux; copy foo to copied" files: copied
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
124
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
125 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
126 copied not renamed
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
127 % foo copied: copied file; source included in new repo
6737
7239e06e58e9 context: consistently return p1 context for None
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
128 @ 4 "8: change foo" files: foo
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
129 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
130 o 3 "6: change foo baz" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
131 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
132 o 2 "2: change foo" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
133 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
134 o 1 "1: add bar quux; copy foo to copied" files: copied
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
135 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
136 o 0 "0: add foo baz dir/" files: foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
137
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 9885
diff changeset
138 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
139 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
140 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
6737
7239e06e58e9 context: consistently return p1 context for None
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
141 @ 4 "8: change foo" files: foo2
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
142 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
143 o 3 "6: change foo baz" files: foo2
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
144 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
145 o 2 "2: change foo" files: foo2
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
146 |
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
147 o 1 "1: add bar quux; copy foo to copied" files: copied2
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
148 |
9885
b1addc725998 test-convert-filemap: test improved filtering algorithm
Patrick Mezard <pmezard@gmail.com>
parents: 6737
diff changeset
149 o 0 "0: add foo baz dir/" files: dir2/file dir2/subdir/file3 foo2
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
150
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 9885
diff changeset
151 d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
152 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file
9885
b1addc725998 test-convert-filemap: test improved filtering algorithm
Patrick Mezard <pmezard@gmail.com>
parents: 6737
diff changeset
153 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir2/subdir/file3
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 5379
diff changeset
154 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2
5379
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
155 copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
156 copied:
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
157 foo
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
158 copied2:
d3e51dc804f8 mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
159 foo