comparison tests/fixtures/replace_branch_with_branch.svndump @ 582:44c56a7727c4

editor: fix issamefile() and copy detection in replay mode Known failures: - comprehensive/test_verify on replace_branch_with_branch: replaced files content is incorrect - comprehensive/test_stupid_pull on replace_branch_with_branch: very stupid mode does not handle replacements correctly.
author Patrick Mezard <pmezard@gmail.com>
date Tue, 02 Mar 2010 17:06:06 +0100
parents
children c06f59441f8e
comparison
equal deleted inserted replaced
581:90efea2c19df 582:44c56a7727c4
1 SVN-fs-dump-format-version: 2
2
3 UUID: 9ccfc2a0-ffd9-470e-a000-ccb1f0fe21e5
4
5 Revision-number: 0
6 Prop-content-length: 56
7 Content-length: 56
8
9 K 8
10 svn:date
11 V 27
12 2010-02-24T20:15:47.286918Z
13 PROPS-END
14
15 Revision-number: 1
16 Prop-content-length: 108
17 Content-length: 108
18
19 K 7
20 svn:log
21 V 7
22 initial
23 K 10
24 svn:author
25 V 7
26 pmezard
27 K 8
28 svn:date
29 V 27
30 2010-02-24T20:15:48.124168Z
31 PROPS-END
32
33 Node-path: branches
34 Node-kind: dir
35 Node-action: add
36 Prop-content-length: 10
37 Content-length: 10
38
39 PROPS-END
40
41
42 Node-path: trunk
43 Node-kind: dir
44 Node-action: add
45 Prop-content-length: 10
46 Content-length: 10
47
48 PROPS-END
49
50
51 Node-path: trunk/a
52 Node-kind: file
53 Node-action: add
54 Prop-content-length: 10
55 Text-content-length: 2
56 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
57 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
58 Content-length: 12
59
60 PROPS-END
61 a
62
63
64 Revision-number: 2
65 Prop-content-length: 108
66 Content-length: 108
67
68 K 7
69 svn:log
70 V 7
71 branch1
72 K 10
73 svn:author
74 V 7
75 pmezard
76 K 8
77 svn:date
78 V 27
79 2010-02-24T20:15:51.070312Z
80 PROPS-END
81
82 Node-path: branches/branch1
83 Node-kind: dir
84 Node-action: add
85 Node-copyfrom-rev: 1
86 Node-copyfrom-path: trunk
87
88
89 Revision-number: 3
90 Prop-content-length: 118
91 Content-length: 118
92
93 K 7
94 svn:log
95 V 16
96 add b to branch1
97 K 10
98 svn:author
99 V 7
100 pmezard
101 K 8
102 svn:date
103 V 27
104 2010-02-24T20:15:53.123732Z
105 PROPS-END
106
107 Node-path: branches/branch1/b
108 Node-kind: file
109 Node-action: add
110 Prop-content-length: 10
111 Text-content-length: 2
112 Text-content-md5: 3b5d5c3712955042212316173ccf37be
113 Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b
114 Content-length: 12
115
116 PROPS-END
117 b
118
119
120 Node-path: branches/branch1/d
121 Node-kind: file
122 Node-action: add
123 Prop-content-length: 10
124 Text-content-length: 2
125 Text-content-md5: e29311f6f1bf1af907f9ef9f44b8328b
126 Text-content-sha1: e983f374794de9c64e3d1c1de1d490c0756eeeff
127 Content-length: 12
128
129 PROPS-END
130 d
131
132
133 Revision-number: 4
134 Prop-content-length: 108
135 Content-length: 108
136
137 K 7
138 svn:log
139 V 7
140 branch2
141 K 10
142 svn:author
143 V 7
144 pmezard
145 K 8
146 svn:date
147 V 27
148 2010-02-24T20:15:55.095809Z
149 PROPS-END
150
151 Node-path: branches/branch2
152 Node-kind: dir
153 Node-action: add
154 Node-copyfrom-rev: 2
155 Node-copyfrom-path: trunk
156
157
158 Revision-number: 5
159 Prop-content-length: 118
160 Content-length: 118
161
162 K 7
163 svn:log
164 V 16
165 add c to branch2
166 K 10
167 svn:author
168 V 7
169 pmezard
170 K 8
171 svn:date
172 V 27
173 2010-02-24T20:15:57.098439Z
174 PROPS-END
175
176 Node-path: branches/branch2/c
177 Node-kind: file
178 Node-action: add
179 Prop-content-length: 10
180 Text-content-length: 2
181 Text-content-md5: 2cd6ee2c70b0bde53fbe6cac3c8b8bb1
182 Text-content-sha1: 2b66fd261ee5c6cfc8de7fa466bab600bcfe4f69
183 Content-length: 12
184
185 PROPS-END
186 c
187
188
189 Revision-number: 6
190 Prop-content-length: 102
191 Content-length: 102
192
193 K 7
194 svn:log
195 V 4
196 blah
197 K 10
198 svn:author
199 V 4
200 evil
201 K 8
202 svn:date
203 V 27
204 2010-02-24T20:15:59.687871Z
205 PROPS-END
206
207 Node-path: branches/branch1
208 Node-kind: dir
209 Node-action: delete
210
211 Node-path: branches/branch1
212 Node-kind: dir
213 Node-action: add
214 Node-copyfrom-rev: 5
215 Node-copyfrom-path: branches/branch2
216
217
218
219
220 Node-path: branches/branch1/a
221 Node-kind: file
222 Node-action: delete
223
224 Node-path: branches/branch1/a
225 Node-kind: file
226 Node-action: add
227 Node-copyfrom-rev: 5
228 Node-copyfrom-path: branches/branch1/d
229 Text-copy-source-md5: e29311f6f1bf1af907f9ef9f44b8328b
230 Text-copy-source-sha1: e983f374794de9c64e3d1c1de1d490c0756eeeff
231
232
233
234