Mercurial > hgsubversion
comparison tests/fixtures/revert.svndump @ 952:9c3b4f59e7e6
stupid: do not close branch upon branch-wide revert
Reverting a branch with a remove followed by a copy results in a branch
replacement. By default, branch replacements are handled by closing the
replaced branch and committing the new branch on top of it. But we do
not really want that when reverting a branch, we only want a linear
history with a changeset capturing the revert.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Tue, 16 Oct 2012 21:17:55 +0200 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
951:bd9c292665fd | 952:9c3b4f59e7e6 |
---|---|
1 SVN-fs-dump-format-version: 2 | |
2 | |
3 UUID: 307f02f4-2d74-44cb-98a4-4e162241d396 | |
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 2012-10-06T08:50:46.559327Z | |
13 PROPS-END | |
14 | |
15 Revision-number: 1 | |
16 Prop-content-length: 105 | |
17 Content-length: 105 | |
18 | |
19 K 10 | |
20 svn:author | |
21 V 7 | |
22 pmezard | |
23 K 8 | |
24 svn:date | |
25 V 27 | |
26 2012-10-06T08:50:46.581582Z | |
27 K 7 | |
28 svn:log | |
29 V 4 | |
30 init | |
31 PROPS-END | |
32 | |
33 Node-path: trunk | |
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/a | |
43 Node-kind: file | |
44 Node-action: add | |
45 Prop-content-length: 10 | |
46 Text-content-length: 2 | |
47 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3 | |
48 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b | |
49 Content-length: 12 | |
50 | |
51 PROPS-END | |
52 a | |
53 | |
54 | |
55 Node-path: trunk/dir | |
56 Node-kind: dir | |
57 Node-action: add | |
58 Prop-content-length: 10 | |
59 Content-length: 10 | |
60 | |
61 PROPS-END | |
62 | |
63 | |
64 Node-path: trunk/dir/b | |
65 Node-kind: file | |
66 Node-action: add | |
67 Prop-content-length: 10 | |
68 Text-content-length: 2 | |
69 Text-content-md5: 3b5d5c3712955042212316173ccf37be | |
70 Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b | |
71 Content-length: 12 | |
72 | |
73 PROPS-END | |
74 b | |
75 | |
76 | |
77 Revision-number: 2 | |
78 Prop-content-length: 113 | |
79 Content-length: 113 | |
80 | |
81 K 10 | |
82 svn:author | |
83 V 7 | |
84 pmezard | |
85 K 8 | |
86 svn:date | |
87 V 27 | |
88 2012-10-06T08:50:47.048033Z | |
89 K 7 | |
90 svn:log | |
91 V 11 | |
92 changefiles | |
93 PROPS-END | |
94 | |
95 Node-path: trunk/a | |
96 Node-kind: file | |
97 Node-action: change | |
98 Text-content-length: 4 | |
99 Text-content-md5: 0d227f1abf8c2932d342e9b99cc957eb | |
100 Text-content-sha1: d7c8127a20a396cff08af086a1c695b0636f0c29 | |
101 Content-length: 4 | |
102 | |
103 a | |
104 a | |
105 | |
106 | |
107 Node-path: trunk/dir/b | |
108 Node-kind: file | |
109 Node-action: change | |
110 Text-content-length: 4 | |
111 Text-content-md5: 06ac26ed8b614fc0b141e4542aa067c2 | |
112 Text-content-sha1: f6980469e74f7125178e88ec571e06fe6ce86e95 | |
113 Content-length: 4 | |
114 | |
115 b | |
116 b | |
117 | |
118 | |
119 Revision-number: 3 | |
120 Prop-content-length: 107 | |
121 Content-length: 107 | |
122 | |
123 K 10 | |
124 svn:author | |
125 V 7 | |
126 pmezard | |
127 K 8 | |
128 svn:date | |
129 V 27 | |
130 2012-10-06T08:50:50.058224Z | |
131 K 7 | |
132 svn:log | |
133 V 6 | |
134 revert | |
135 PROPS-END | |
136 | |
137 Node-path: trunk | |
138 Node-kind: dir | |
139 Node-action: delete | |
140 | |
141 Node-path: trunk | |
142 Node-kind: dir | |
143 Node-action: add | |
144 Node-copyfrom-rev: 1 | |
145 Node-copyfrom-path: trunk | |
146 | |
147 | |
148 | |
149 | |
150 Revision-number: 4 | |
151 Prop-content-length: 108 | |
152 Content-length: 108 | |
153 | |
154 K 10 | |
155 svn:author | |
156 V 7 | |
157 pmezard | |
158 K 8 | |
159 svn:date | |
160 V 27 | |
161 2012-10-06T08:50:54.047396Z | |
162 K 7 | |
163 svn:log | |
164 V 7 | |
165 revert2 | |
166 PROPS-END | |
167 | |
168 Node-path: trunk/a | |
169 Node-kind: file | |
170 Node-action: delete | |
171 | |
172 Node-path: trunk/a | |
173 Node-kind: file | |
174 Node-action: add | |
175 Node-copyfrom-rev: 2 | |
176 Node-copyfrom-path: trunk/a | |
177 Text-copy-source-md5: 0d227f1abf8c2932d342e9b99cc957eb | |
178 Text-copy-source-sha1: d7c8127a20a396cff08af086a1c695b0636f0c29 | |
179 | |
180 | |
181 | |
182 | |
183 Node-path: trunk/dir/b | |
184 Node-kind: file | |
185 Node-action: delete | |
186 | |
187 Node-path: trunk/dir/b | |
188 Node-kind: file | |
189 Node-action: add | |
190 Node-copyfrom-rev: 2 | |
191 Node-copyfrom-path: trunk/dir/b | |
192 Text-copy-source-md5: 06ac26ed8b614fc0b141e4542aa067c2 | |
193 Text-copy-source-sha1: f6980469e74f7125178e88ec571e06fe6ce86e95 | |
194 | |
195 | |
196 | |
197 |