@matheusbsbs / matheus-bagliano / commits / c79f1189bc
Fork 0

git-svn: update svn mergeinfo test suite

Add a partial branch (e.g., a branch from a project subdirectory) to the git-svn mergeinfo test repository. Add a tag and a branch from that tag to the git-svn mergeinfo test repository. Update the test script to expect a known failure in git-svn exposed by these additions where merge info for partial branches is not preserved. Signed-off-by: Andrew Myrick <amyrick@apple.com> Acked-by: Eric Wong <normalperson@yhbt.net>

Andrew Myrick committed Jan 21, 2010 at 21:55 UTC c79f1189bc4e7d9bb9cb673c043ce8f587a9a92d
3 files changed +485 -127
t/t9151-svn-mergeinfo.sh
+1 -1
@@ -33,7 +33,7 @@ test_expect_success 'svn non-merge merge commits did not become git merge commit
33 [ -z "$bad_non_merges" ]
34 '
35
36 -test_expect_success 'everything got merged in the end' '
36 +test_expect_failure 'everything got merged in the end' '
37 unmerged=$(git rev-list --all --not master)
38 [ -z "$unmerged" ]
39 '
t/t9151/make-svnmerge-dump
+63 -2
@@ -26,8 +26,9 @@ i=0
26 cd foo
27 mkdir trunk
28 mkdir branches
29 -svn add trunk branches
30 -i=$(commit $i "Setup trunk and branches")
29 +mkdir tags
30 +svn add trunk branches tags
31 +i=$(commit $i "Setup trunk, branches, and tags")
32
33 git cat-file blob 6683463e:Makefile > trunk/Makefile
34 svn add trunk/Makefile
@@ -155,6 +156,66 @@ svn merge ../branches/right --accept postpone
156 i=$(commit $i "non-merge right to trunk 2")
157 cd ..
158
159 +say "Adding subdirectory to LEFT"
160 +svn update
161 +cd branches/left
162 +mkdir subdir
163 +echo "Yeehaw" > subdir/cowboy
164 +svn add subdir
165 +i=$(commit $i "add subdirectory to left branch")
166 +cd ../../
167 +
168 +say "Merging LEFT to TRUNK"
169 +svn update
170 +cd trunk
171 +svn merge ../branches/left --accept postpone
172 +i=$(commit $i "merge left to trunk")
173 +cd ..
174 +
175 +say "Make PARTIAL branch"
176 +svn update
177 +i=$(commit $i "make partial branch")
178 +svn cp trunk/subdir branches/partial
179 +
180 +say "Make a commit to PARTIAL"
181 +svn update
182 +cd branches/partial
183 +echo "racecar" > palindromes
184 +svn add palindromes
185 +i=$(commit $i "partial update")
186 +cd ../../
187 +
188 +say "Merge PARTIAL to TRUNK"
189 +svn update
190 +cd trunk/subdir
191 +svn merge ../../branches/partial --accept postpone
192 +i=$(commit $i "merge partial to trunk")
193 +cd ../../
194 +
195 +say "Tagging trunk"
196 +svn update
197 +i=$(commit $i "tagging v1.0")
198 +svn cp trunk tags/v1.0
199 +
200 +say "Branching BUGFIX from v1.0"
201 +svn update
202 +i=$(commit $i "make bugfix branch from tag")
203 +svn cp tags/v1.0 branches/bugfix
204 +
205 +say "Make a commit to BUGFIX"
206 +svn update
207 +cd branches/bugfix/
208 +echo "kayak" >> subdir/palindromes
209 +i=$(commit $i "commit to bugfix")
210 +cd ../../
211 +
212 +say "Merge BUGFIX to TRUNK"
213 +svn update
214 +cd trunk
215 +svn merge ../branches/bugfix/ --accept postpone
216 +i=$(commit $i "Merge BUGFIX to TRUNK")
217 +cd ..
218 +
219 cd ..
220 svnadmin dump foo.svn > svn-mergeinfo.dump
221
t/t9151/svn-mergeinfo.dump
+421 -124
@@ -1,6 +1,6 @@
1 SVN-fs-dump-format-version: 2
2
3 -UUID: 64142547-0943-4db2-836a-d1e1eb2f9924
3 +UUID: d6191530-2693-4a8e-98e7-b194d4c3edd8
4
5 Revision-number: 0
6 Prop-content-length: 56
@@ -9,25 +9,25 @@ Content-length: 56
9 K 8
10 svn:date
11 V 27
12 -2009-12-19T16:17:51.232640Z
12 +2010-01-19T04:14:02.832406Z
13 PROPS-END
14
15 Revision-number: 1
16 -Prop-content-length: 128
17 -Content-length: 128
16 +Prop-content-length: 134
17 +Content-length: 134
18
19 K 7
20 svn:log
21 -V 29
22 -(r1) Setup trunk and branches
21 +V 36
22 +(r1) Setup trunk, branches, and tags
23 K 10
24 svn:author
25 -V 4
26 -samv
25 +V 3
26 +adm
27 K 8
28 svn:date
29 V 27
30 -2009-12-19T16:17:51.831965Z
30 +2010-01-19T04:14:03.055172Z
31 PROPS-END
32
33 Node-path: branches
@@ -39,6 +39,15 @@ Content-length: 10
39 PROPS-END
40
41
42 +Node-path: tags
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
52 Node-kind: dir
53 Node-action: add
@@ -49,8 +58,8 @@ PROPS-END
58
59
60 Revision-number: 2
52 -Prop-content-length: 112
53 -Content-length: 112
61 +Prop-content-length: 111
62 +Content-length: 111
63
64 K 7
65 svn:log
@@ -58,12 +67,12 @@ V 13
67 (r2) ancestor
68 K 10
69 svn:author
61 -V 4
62 -samv
70 +V 3
71 +adm
72 K 8
73 svn:date
74 V 27
66 -2009-12-19T16:17:52.300075Z
75 +2010-01-19T04:14:04.064506Z
76 PROPS-END
77
78 Node-path: trunk/Makefile
@@ -156,8 +165,8 @@ backup: clean
165
166
167 Revision-number: 3
159 -Prop-content-length: 120
160 -Content-length: 120
168 +Prop-content-length: 119
169 +Content-length: 119
170
171 K 7
172 svn:log
@@ -165,12 +174,12 @@ V 21
174 (r3) make left branch
175 K 10
176 svn:author
168 -V 4
169 -samv
177 +V 3
178 +adm
179 K 8
180 svn:date
181 V 27
173 -2009-12-19T16:17:52.768800Z
182 +2010-01-19T04:14:06.040389Z
183 PROPS-END
184
185 Node-path: branches/left
@@ -190,8 +199,8 @@ Text-copy-source-sha1: 103205ce331f7d64086dba497574734f78439590
199
200
201 Revision-number: 4
193 -Prop-content-length: 121
194 -Content-length: 121
202 +Prop-content-length: 120
203 +Content-length: 120
204
205 K 7
206 svn:log
@@ -199,12 +208,12 @@ V 22
208 (r4) make right branch
209 K 10
210 svn:author
202 -V 4
203 -samv
211 +V 3
212 +adm
213 K 8
214 svn:date
215 V 27
207 -2009-12-19T16:17:53.177879Z
216 +2010-01-19T04:14:08.040905Z
217 PROPS-END
218
219 Node-path: branches/right
@@ -224,8 +233,8 @@ Text-copy-source-sha1: 103205ce331f7d64086dba497574734f78439590
233
234
235 Revision-number: 5
227 -Prop-content-length: 117
228 -Content-length: 117
236 +Prop-content-length: 116
237 +Content-length: 116
238
239 K 7
240 svn:log
@@ -233,12 +242,12 @@ V 18
242 (r5) left update 1
243 K 10
244 svn:author
236 -V 4
237 -samv
245 +V 3
246 +adm
247 K 8
248 svn:date
249 V 27
241 -2009-12-19T16:17:53.604691Z
250 +2010-01-19T04:14:09.049169Z
251 PROPS-END
252
253 Node-path: branches/left/Makefile
@@ -329,8 +338,8 @@ backup: clean
338
339
340 Revision-number: 6
332 -Prop-content-length: 118
333 -Content-length: 118
341 +Prop-content-length: 117
342 +Content-length: 117
343
344 K 7
345 svn:log
@@ -338,12 +347,12 @@ V 19
347 (r6) right update 1
348 K 10
349 svn:author
341 -V 4
342 -samv
350 +V 3
351 +adm
352 K 8
353 svn:date
354 V 27
346 -2009-12-19T16:17:54.063555Z
355 +2010-01-19T04:14:10.049350Z
356 PROPS-END
357
358 Node-path: branches/right/Makefile
@@ -437,8 +446,8 @@ backup: clean
446
447
448 Revision-number: 7
440 -Prop-content-length: 117
441 -Content-length: 117
449 +Prop-content-length: 116
450 +Content-length: 116
451
452 K 7
453 svn:log
@@ -446,12 +455,12 @@ V 18
455 (r7) left update 2
456 K 10
457 svn:author
449 -V 4
450 -samv
458 +V 3
459 +adm
460 K 8
461 svn:date
462 V 27
454 -2009-12-19T16:17:54.523904Z
463 +2010-01-19T04:14:11.049209Z
464 PROPS-END
465
466 Node-path: branches/left/Makefile
@@ -542,8 +551,8 @@ backup: clean
551
552
553 Revision-number: 8
545 -Prop-content-length: 117
546 -Content-length: 117
554 +Prop-content-length: 116
555 +Content-length: 116
556
557 K 7
558 svn:log
@@ -551,12 +560,12 @@ V 18
560 (r8) left update 3
561 K 10
562 svn:author
554 -V 4
555 -samv
563 +V 3
564 +adm
565 K 8
566 svn:date
567 V 27
559 -2009-12-19T16:17:54.975970Z
568 +2010-01-19T04:14:12.049234Z
569 PROPS-END
570
571 Node-path: branches/left/Makefile
@@ -647,8 +656,8 @@ backup: clean
656
657
658 Revision-number: 9
650 -Prop-content-length: 124
651 -Content-length: 124
659 +Prop-content-length: 123
660 +Content-length: 123
661
662 K 7
663 svn:log
@@ -656,12 +665,12 @@ V 25
665 (r9) make left sub-branch
666 K 10
667 svn:author
659 -V 4
660 -samv
668 +V 3
669 +adm
670 K 8
671 svn:date
672 V 27
664 -2009-12-19T16:17:55.459904Z
673 +2010-01-19T04:14:14.040894Z
674 PROPS-END
675
676 Node-path: branches/left-sub
@@ -687,8 +696,8 @@ Text-copy-source-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
696
697
698 Revision-number: 10
690 -Prop-content-length: 129
691 -Content-length: 129
699 +Prop-content-length: 128
700 +Content-length: 128
701
702 K 7
703 svn:log
@@ -696,12 +705,12 @@ V 30
705 (r10) left sub-branch update 1
706 K 10
707 svn:author
699 -V 4
700 -samv
708 +V 3
709 +adm
710 K 8
711 svn:date
712 V 27
704 -2009-12-19T16:17:55.862113Z
713 +2010-01-19T04:14:15.049935Z
714 PROPS-END
715
716 Node-path: branches/left-sub/README
@@ -718,8 +727,8 @@ crunch
727
728
729 Revision-number: 11
721 -Prop-content-length: 126
722 -Content-length: 126
730 +Prop-content-length: 125
731 +Content-length: 125
732
733 K 7
734 svn:log
@@ -727,12 +736,12 @@ V 27
736 (r11) Merge left to trunk 1
737 K 10
738 svn:author
730 -V 4
731 -samv
739 +V 3
740 +adm
741 K 8
742 svn:date
743 V 27
735 -2009-12-19T16:17:56.413416Z
744 +2010-01-19T04:14:18.056594Z
745 PROPS-END
746
747 Node-path: trunk
@@ -836,8 +845,8 @@ backup: clean
845
846
847 Revision-number: 12
839 -Prop-content-length: 118
840 -Content-length: 118
848 +Prop-content-length: 117
849 +Content-length: 117
850
851 K 7
852 svn:log
@@ -845,12 +854,12 @@ V 19
854 (r12) left update 4
855 K 10
856 svn:author
848 -V 4
849 -samv
857 +V 3
858 +adm
859 K 8
860 svn:date
861 V 27
853 -2009-12-19T16:17:56.831014Z
862 +2010-01-19T04:14:19.049620Z
863 PROPS-END
864
865 Node-path: branches/left/zlonk
@@ -867,8 +876,8 @@ touche
876
877
878 Revision-number: 13
870 -Prop-content-length: 119
871 -Content-length: 119
879 +Prop-content-length: 118
880 +Content-length: 118
881
882 K 7
883 svn:log
@@ -876,12 +885,12 @@ V 20
885 (r13) right update 2
886 K 10
887 svn:author
879 -V 4
880 -samv
888 +V 3
889 +adm
890 K 8
891 svn:date
892 V 27
884 -2009-12-19T16:17:57.341143Z
893 +2010-01-19T04:14:20.049659Z
894 PROPS-END
895
896 Node-path: branches/right/bang
@@ -898,8 +907,8 @@ thwacke
907
908
909 Revision-number: 14
901 -Prop-content-length: 141
902 -Content-length: 141
910 +Prop-content-length: 140
911 +Content-length: 140
912
913 K 7
914 svn:log
@@ -907,12 +916,12 @@ V 42
916 (r14) Cherry-pick right 2 commits to trunk
917 K 10
918 svn:author
910 -V 4
911 -samv
919 +V 3
920 +adm
921 K 8
922 svn:date
923 V 27
915 -2009-12-19T16:17:57.841851Z
924 +2010-01-19T04:14:23.041991Z
925 PROPS-END
926
927 Node-path: trunk
@@ -1029,8 +1038,8 @@ Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
1038
1039
1040 Revision-number: 15
1032 -Prop-content-length: 127
1033 -Content-length: 127
1041 +Prop-content-length: 126
1042 +Content-length: 126
1043
1044 K 7
1045 svn:log
@@ -1038,12 +1047,12 @@ V 28
1047 (r15) Merge right to trunk 1
1048 K 10
1049 svn:author
1041 -V 4
1042 -samv
1050 +V 3
1051 +adm
1052 K 8
1053 svn:date
1054 V 27
1046 -2009-12-19T16:17:58.368520Z
1055 +2010-01-19T04:14:26.054456Z
1056 PROPS-END
1057
1058 Node-path: trunk
@@ -1061,8 +1070,8 @@ PROPS-END
1070
1071
1072 Revision-number: 16
1064 -Prop-content-length: 119
1065 -Content-length: 119
1073 +Prop-content-length: 118
1074 +Content-length: 118
1075
1076 K 7
1077 svn:log
@@ -1070,12 +1079,12 @@ V 20
1079 (r16) right update 3
1080 K 10
1081 svn:author
1073 -V 4
1074 -samv
1082 +V 3
1083 +adm
1084 K 8
1085 svn:date
1086 V 27
1078 -2009-12-19T16:17:58.779056Z
1087 +2010-01-19T04:14:27.049955Z
1088 PROPS-END
1089
1090 Node-path: branches/right/urkkk
@@ -1092,8 +1101,8 @@ whamm
1101
1102
1103 Revision-number: 17
1095 -Prop-content-length: 119
1096 -Content-length: 119
1104 +Prop-content-length: 118
1105 +Content-length: 118
1106
1107 K 7
1108 svn:log
@@ -1101,12 +1110,12 @@ V 20
1110 (r17) trunk update 1
1111 K 10
1112 svn:author
1104 -V 4
1105 -samv
1113 +V 3
1114 +adm
1115 K 8
1116 svn:date
1117 V 27
1109 -2009-12-19T16:17:59.221851Z
1118 +2010-01-19T04:14:28.049615Z
1119 PROPS-END
1120
1121 Node-path: trunk/vronk
@@ -1123,8 +1132,8 @@ pow
1132
1133
1134 Revision-number: 18
1126 -Prop-content-length: 135
1127 -Content-length: 135
1135 +Prop-content-length: 134
1136 +Content-length: 134
1137
1138 K 7
1139 svn:log
@@ -1132,12 +1141,12 @@ V 36
1141 (r18) Merge right to left sub-branch
1142 K 10
1143 svn:author
1135 -V 4
1136 -samv
1144 +V 3
1145 +adm
1146 K 8
1147 svn:date
1148 V 27
1140 -2009-12-19T16:17:59.781666Z
1149 +2010-01-19T04:14:31.061460Z
1150 PROPS-END
1151
1152 Node-path: branches/left-sub
@@ -1262,8 +1271,8 @@ Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1271
1272
1273 Revision-number: 19
1265 -Prop-content-length: 129
1266 -Content-length: 129
1274 +Prop-content-length: 128
1275 +Content-length: 128
1276
1277 K 7
1278 svn:log
@@ -1271,12 +1280,12 @@ V 30
1280 (r19) left sub-branch update 2
1281 K 10
1282 svn:author
1274 -V 4
1275 -samv
1283 +V 3
1284 +adm
1285 K 8
1286 svn:date
1287 V 27
1279 -2009-12-19T16:18:00.200531Z
1288 +2010-01-19T04:14:32.049244Z
1289 PROPS-END
1290
1291 Node-path: branches/left-sub/wham_eth
@@ -1293,8 +1302,8 @@ zowie
1302
1303
1304 Revision-number: 20
1296 -Prop-content-length: 118
1297 -Content-length: 118
1305 +Prop-content-length: 117
1306 +Content-length: 117
1307
1308 K 7
1309 svn:log
@@ -1302,12 +1311,12 @@ V 19
1311 (r20) left update 5
1312 K 10
1313 svn:author
1305 -V 4
1306 -samv
1314 +V 3
1315 +adm
1316 K 8
1317 svn:date
1318 V 27
1310 -2009-12-19T16:18:00.659636Z
1319 +2010-01-19T04:14:33.049332Z
1320 PROPS-END
1321
1322 Node-path: branches/left/glurpp
@@ -1324,8 +1333,8 @@ eee_yow
1333
1334
1335 Revision-number: 21
1327 -Prop-content-length: 147
1328 -Content-length: 147
1336 +Prop-content-length: 146
1337 +Content-length: 146
1338
1339 K 7
1340 svn:log
@@ -1333,12 +1342,12 @@ V 48
1342 (r21) Cherry-pick left sub-branch commit to left
1343 K 10
1344 svn:author
1336 -V 4
1337 -samv
1345 +V 3
1346 +adm
1347 K 8
1348 svn:date
1349 V 27
1341 -2009-12-19T16:18:01.194402Z
1350 +2010-01-19T04:14:36.041839Z
1351 PROPS-END
1352
1353 Node-path: branches/left
@@ -1364,8 +1373,8 @@ Text-copy-source-sha1: b165019b005c199237ba822c4404e771e93b654a
1373
1374
1375 Revision-number: 22
1367 -Prop-content-length: 134
1368 -Content-length: 134
1376 +Prop-content-length: 133
1377 +Content-length: 133
1378
1379 K 7
1380 svn:log
@@ -1373,12 +1382,12 @@ V 35
1382 (r22) Merge left sub-branch to left
1383 K 10
1384 svn:author
1376 -V 4
1377 -samv
1385 +V 3
1386 +adm
1387 K 8
1388 svn:date
1389 V 27
1381 -2009-12-19T16:18:01.679218Z
1390 +2010-01-19T04:14:39.045014Z
1391 PROPS-END
1392
1393 Node-path: branches/left
@@ -1513,8 +1522,8 @@ Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1522
1523
1524 Revision-number: 23
1516 -Prop-content-length: 126
1517 -Content-length: 126
1525 +Prop-content-length: 125
1526 +Content-length: 125
1527
1528 K 7
1529 svn:log
@@ -1522,12 +1531,12 @@ V 27
1531 (r23) Merge left to trunk 2
1532 K 10
1533 svn:author
1525 -V 4
1526 -samv
1534 +V 3
1535 +adm
1536 K 8
1537 svn:date
1538 V 27
1530 -2009-12-19T16:18:02.212349Z
1539 +2010-01-19T04:14:42.052798Z
1540 PROPS-END
1541
1542 Node-path: trunk
@@ -1591,8 +1600,8 @@ Text-copy-source-sha1: 9716527ebd70a75c27625cacbeb2d897c6e86178
1600
1601
1602 Revision-number: 24
1594 -Prop-content-length: 131
1595 -Content-length: 131
1603 +Prop-content-length: 130
1604 +Content-length: 130
1605
1606 K 7
1607 svn:log
@@ -1600,12 +1609,12 @@ V 32
1609 (r24) non-merge right to trunk 2
1610 K 10
1611 svn:author
1603 -V 4
1604 -samv
1612 +V 3
1613 +adm
1614 K 8
1615 svn:date
1616 V 27
1608 -2009-12-19T16:18:02.672148Z
1617 +2010-01-19T04:14:44.038434Z
1618 PROPS-END
1619
1620 Node-path: trunk
@@ -1623,3 +1632,291 @@ V 64
1632 PROPS-END
1633
1634
1635 +Revision-number: 25
1636 +Prop-content-length: 135
1637 +Content-length: 135
1638 +
1639 +K 7
1640 +svn:log
1641 +V 37
1642 +(r25) add subdirectory to left branch
1643 +K 10
1644 +svn:author
1645 +V 3
1646 +adm
1647 +K 8
1648 +svn:date
1649 +V 27
1650 +2010-01-19T04:14:46.052649Z
1651 +PROPS-END
1652 +
1653 +Node-path: branches/left/subdir
1654 +Node-kind: dir
1655 +Node-action: add
1656 +Prop-content-length: 10
1657 +Content-length: 10
1658 +
1659 +PROPS-END
1660 +
1661 +
1662 +Node-path: branches/left/subdir/cowboy
1663 +Node-kind: file
1664 +Node-action: add
1665 +Prop-content-length: 10
1666 +Text-content-length: 7
1667 +Text-content-md5: f1d6530278ad409e68cc675476ad995f
1668 +Text-content-sha1: 732d9e3e5c391ffd767a98b45ddcc848de778cea
1669 +Content-length: 17
1670 +
1671 +PROPS-END
1672 +Yeehaw
1673 +
1674 +
1675 +Revision-number: 26
1676 +Prop-content-length: 123
1677 +Content-length: 123
1678 +
1679 +K 7
1680 +svn:log
1681 +V 25
1682 +(r26) merge left to trunk
1683 +K 10
1684 +svn:author
1685 +V 3
1686 +adm
1687 +K 8
1688 +svn:date
1689 +V 27
1690 +2010-01-19T04:14:49.040783Z
1691 +PROPS-END
1692 +
1693 +Node-path: trunk
1694 +Node-kind: dir
1695 +Node-action: change
1696 +Prop-content-length: 99
1697 +Content-length: 99
1698 +
1699 +K 13
1700 +svn:mergeinfo
1701 +V 64
1702 +/branches/left:2-25
1703 +/branches/left-sub:4-19
1704 +/branches/right:2-22
1705 +PROPS-END
1706 +
1707 +
1708 +Node-path: trunk/subdir
1709 +Node-kind: dir
1710 +Node-action: add
1711 +Node-copyfrom-rev: 25
1712 +Node-copyfrom-path: branches/left/subdir
1713 +
1714 +
1715 +Revision-number: 27
1716 +Prop-content-length: 118
1717 +Content-length: 118
1718 +
1719 +K 7
1720 +svn:log
1721 +V 20
1722 +(r28) partial update
1723 +K 10
1724 +svn:author
1725 +V 3
1726 +adm
1727 +K 8
1728 +svn:date
1729 +V 27
1730 +2010-01-19T04:14:53.049037Z
1731 +PROPS-END
1732 +
1733 +Node-path: branches/partial
1734 +Node-kind: dir
1735 +Node-action: add
1736 +Node-copyfrom-rev: 26
1737 +Node-copyfrom-path: trunk/subdir
1738 +
1739 +
1740 +Node-path: branches/partial/palindromes
1741 +Node-kind: file
1742 +Node-action: add
1743 +Prop-content-length: 10
1744 +Text-content-length: 8
1745 +Text-content-md5: 5d1c2024fb5efc4eef812856df1b080c
1746 +Text-content-sha1: 5f8509ddd14c91a52864dd1447344e706f9bbc69
1747 +Content-length: 18
1748 +
1749 +PROPS-END
1750 +racecar
1751 +
1752 +
1753 +Revision-number: 28
1754 +Prop-content-length: 126
1755 +Content-length: 126
1756 +
1757 +K 7
1758 +svn:log
1759 +V 28
1760 +(r29) merge partial to trunk
1761 +K 10
1762 +svn:author
1763 +V 3
1764 +adm
1765 +K 8
1766 +svn:date
1767 +V 27
1768 +2010-01-19T04:14:56.041526Z
1769 +PROPS-END
1770 +
1771 +Node-path: trunk/subdir
1772 +Node-kind: dir
1773 +Node-action: change
1774 +Prop-content-length: 142
1775 +Content-length: 142
1776 +
1777 +K 13
1778 +svn:mergeinfo
1779 +V 106
1780 +/branches/left/subdir:2-25
1781 +/branches/left-sub/subdir:4-19
1782 +/branches/partial:27
1783 +/branches/right/subdir:2-22
1784 +PROPS-END
1785 +
1786 +
1787 +Node-path: trunk/subdir/palindromes
1788 +Node-kind: file
1789 +Node-action: add
1790 +Node-copyfrom-rev: 27
1791 +Node-copyfrom-path: branches/partial/palindromes
1792 +Text-copy-source-md5: 5d1c2024fb5efc4eef812856df1b080c
1793 +Text-copy-source-sha1: 5f8509ddd14c91a52864dd1447344e706f9bbc69
1794 +
1795 +
1796 +Revision-number: 29
1797 +Prop-content-length: 131
1798 +Content-length: 131
1799 +
1800 +K 7
1801 +svn:log
1802 +V 33
1803 +(r31) make bugfix branch from tag
1804 +K 10
1805 +svn:author
1806 +V 3
1807 +adm
1808 +K 8
1809 +svn:date
1810 +V 27
1811 +2010-01-19T04:15:00.039761Z
1812 +PROPS-END
1813 +
1814 +Node-path: tags/v1.0
1815 +Node-kind: dir
1816 +Node-action: add
1817 +Node-copyfrom-rev: 28
1818 +Node-copyfrom-path: trunk
1819 +
1820 +
1821 +Revision-number: 30
1822 +Prop-content-length: 120
1823 +Content-length: 120
1824 +
1825 +K 7
1826 +svn:log
1827 +V 22
1828 +(r32) commit to bugfix
1829 +K 10
1830 +svn:author
1831 +V 3
1832 +adm
1833 +K 8
1834 +svn:date
1835 +V 27
1836 +2010-01-19T04:15:03.043218Z
1837 +PROPS-END
1838 +
1839 +Node-path: branches/bugfix
1840 +Node-kind: dir
1841 +Node-action: add
1842 +Node-copyfrom-rev: 29
1843 +Node-copyfrom-path: tags/v1.0
1844 +
1845 +
1846 +Node-path: branches/bugfix/subdir/palindromes
1847 +Node-kind: file
1848 +Node-action: change
1849 +Text-content-length: 14
1850 +Text-content-md5: 3b12d98578a3f4320ba97e66da54fe5f
1851 +Text-content-sha1: 672931c9e8ac2c408209efab2f015638b6d64042
1852 +Content-length: 14
1853 +
1854 +racecar
1855 +kayak
1856 +
1857 +
1858 +Revision-number: 31
1859 +Prop-content-length: 125
1860 +Content-length: 125
1861 +
1862 +K 7
1863 +svn:log
1864 +V 27
1865 +(r33) Merge BUGFIX to TRUNK
1866 +K 10
1867 +svn:author
1868 +V 3
1869 +adm
1870 +K 8
1871 +svn:date
1872 +V 27
1873 +2010-01-19T04:15:06.043723Z
1874 +PROPS-END
1875 +
1876 +Node-path: trunk
1877 +Node-kind: dir
1878 +Node-action: change
1879 +Prop-content-length: 133
1880 +Content-length: 133
1881 +
1882 +K 13
1883 +svn:mergeinfo
1884 +V 98
1885 +/branches/bugfix:30
1886 +/branches/left:2-25
1887 +/branches/left-sub:4-19
1888 +/branches/right:2-22
1889 +/tags/v1.0:29
1890 +PROPS-END
1891 +
1892 +
1893 +Node-path: trunk/subdir
1894 +Node-kind: dir
1895 +Node-action: change
1896 +Prop-content-length: 190
1897 +Content-length: 190
1898 +
1899 +K 13
1900 +svn:mergeinfo
1901 +V 154
1902 +/branches/bugfix/subdir:30
1903 +/branches/left/subdir:2-25
1904 +/branches/left-sub/subdir:4-19
1905 +/branches/partial:27
1906 +/branches/right/subdir:2-22
1907 +/tags/v1.0/subdir:29
1908 +PROPS-END
1909 +
1910 +
1911 +Node-path: trunk/subdir/palindromes
1912 +Node-kind: file
1913 +Node-action: change
1914 +Text-content-length: 14
1915 +Text-content-md5: 3b12d98578a3f4320ba97e66da54fe5f
1916 +Text-content-sha1: 672931c9e8ac2c408209efab2f015638b6d64042
1917 +Content-length: 14
1918 +
1919 +racecar
1920 +kayak
1921 +
1922 +