comparison tests/fixtures/unorderedbranch.svndump @ 131:4d42dbbb5127

hg_delta_editor: fix parent revision detection on branch copy Project items copyfrom revisions are irrelevant to parent revision detection, only the project one or those of its ancestors matter. Items copyfrom is useful when retrieving items content. Former code resulted in incorrect converted graph for pyglet repository, especially on the following revision: ------------------------------------------------------------------------ r274 | r1chardj0n3s | 2006-12-21 02:02:14 +0100 (Jeu, 21 Dec 2006) | 2 lines Changed paths: A /branches/richard-glx-version (from /trunk:269) M /branches/richard-glx-version/pyglet/window/xlib/__init__.py R /branches/richard-glx-version/tests/test.py (from /trunk/tests/test.py:270) R /branches/richard-glx-version/tools/info.py (from /trunk/tools/info.py:272) R /branches/richard-glx-version/website/get_involved.php (from /trunk/website/get_involved.php:273) Branching to horribly mangle GLX
author Patrick Mezard <pmezard@gmail.com>
date Wed, 10 Dec 2008 11:03:22 -0600
parents
children
comparison
equal deleted inserted replaced
130:c2a84d436202 131:4d42dbbb5127
1 SVN-fs-dump-format-version: 2
2
3 UUID: 0f1e934c-2a07-4fc9-acf5-47264bd6bc41
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 2008-12-06T16:48:56.303240Z
13 PROPS-END
14
15 Revision-number: 1
16 Prop-content-length: 114
17 Content-length: 114
18
19 K 7
20 svn:log
21 V 12
22 init project
23 K 10
24 svn:author
25 V 7
26 pmezard
27 K 8
28 svn:date
29 V 27
30 2008-12-06T16:48:56.429957Z
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 Revision-number: 2
52 Prop-content-length: 116
53 Content-length: 116
54
55 K 7
56 svn:log
57 V 14
58 add a in trunk
59 K 10
60 svn:author
61 V 7
62 pmezard
63 K 8
64 svn:date
65 V 27
66 2008-12-06T16:48:57.178238Z
67 PROPS-END
68
69 Node-path: trunk/a
70 Node-kind: file
71 Node-action: add
72 Prop-content-length: 10
73 Text-content-length: 2
74 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
75 Content-length: 12
76
77 PROPS-END
78 a
79
80
81 Revision-number: 3
82 Prop-content-length: 122
83 Content-length: 122
84
85 K 7
86 svn:log
87 V 20
88 add b and z in trunk
89 K 10
90 svn:author
91 V 7
92 pmezard
93 K 8
94 svn:date
95 V 27
96 2008-12-06T16:48:58.191379Z
97 PROPS-END
98
99 Node-path: trunk/b
100 Node-kind: file
101 Node-action: add
102 Prop-content-length: 10
103 Text-content-length: 2
104 Text-content-md5: 3b5d5c3712955042212316173ccf37be
105 Content-length: 12
106
107 PROPS-END
108 b
109
110
111 Node-path: trunk/z
112 Node-kind: file
113 Node-action: add
114 Prop-content-length: 10
115 Text-content-length: 2
116 Text-content-md5: a8a78d0ff555c931f045b6f448129846
117 Content-length: 12
118
119 PROPS-END
120 z
121
122
123 Revision-number: 4
124 Prop-content-length: 118
125 Content-length: 118
126
127 K 7
128 svn:log
129 V 16
130 branch and add c
131 K 10
132 svn:author
133 V 7
134 pmezard
135 K 8
136 svn:date
137 V 27
138 2008-12-06T16:49:02.185634Z
139 PROPS-END
140
141 Node-path: branches/branch
142 Node-kind: dir
143 Node-action: add
144 Node-copyfrom-rev: 2
145 Node-copyfrom-path: trunk
146
147
148 Node-path: branches/branch/c
149 Node-kind: file
150 Node-action: add
151 Prop-content-length: 10
152 Text-content-length: 2
153 Text-content-md5: 2cd6ee2c70b0bde53fbe6cac3c8b8bb1
154 Content-length: 12
155
156 PROPS-END
157 c
158
159
160 Node-path: branches/branch/z
161 Node-kind: file
162 Node-action: add
163 Node-copyfrom-rev: 3
164 Node-copyfrom-path: trunk/z
165 Text-copy-source-md5: a8a78d0ff555c931f045b6f448129846
166 Prop-content-length: 34
167 Content-length: 34
168
169 K 13
170 svn:mergeinfo
171 V 0
172
173 PROPS-END
174
175