In the command-line client, forbid
[svn.git] / subversion / tests / cmdline / mergetracking_data / basic-merge.dump
blob835b8c6ba0411a55bf64f57b2978f93f0ee9ddb2
1 SVN-fs-dump-format-version: 2
3 UUID: db9708ae-150b-11dc-aa55-db53e26e7084
5 Revision-number: 0
6 Prop-content-length: 56
7 Content-length: 56
9 K 8
10 svn:date
11 V 27
12 2007-06-07T15:29:18.726206Z
13 PROPS-END
15 Revision-number: 1
16 Prop-content-length: 146
17 Content-length: 146
19 K 7
20 svn:log
21 V 44
22 Add standard trunk/tags/branches structure.
24 K 10
25 svn:author
26 V 7
27 jrandom
28 K 8
29 svn:date
30 V 27
31 2007-06-07T15:30:32.798099Z
32 PROPS-END
34 Node-path: branches
35 Node-kind: dir
36 Node-action: add
37 Prop-content-length: 10
38 Content-length: 10
40 PROPS-END
43 Node-path: tags
44 Node-kind: dir
45 Node-action: add
46 Prop-content-length: 10
47 Content-length: 10
49 PROPS-END
52 Node-path: trunk
53 Node-kind: dir
54 Node-action: add
55 Prop-content-length: 10
56 Content-length: 10
58 PROPS-END
61 Revision-number: 2
62 Prop-content-length: 131
63 Content-length: 131
65 K 7
66 svn:log
67 V 29
68 Import greek tree into trunk.
69 K 10
70 svn:author
71 V 7
72 jrandom
73 K 8
74 svn:date
75 V 27
76 2007-06-07T15:16:49.020461Z
77 PROPS-END
79 Node-path: trunk/A
80 Node-kind: dir
81 Node-action: add
82 Prop-content-length: 10
83 Content-length: 10
85 PROPS-END
88 Node-path: trunk/A/B
89 Node-kind: dir
90 Node-action: add
91 Prop-content-length: 10
92 Content-length: 10
94 PROPS-END
97 Node-path: trunk/A/B/E
98 Node-kind: dir
99 Node-action: add
100 Prop-content-length: 10
101 Content-length: 10
103 PROPS-END
106 Node-path: trunk/A/B/E/alpha
107 Node-kind: file
108 Node-action: add
109 Prop-content-length: 10
110 Text-content-length: 26
111 Text-content-md5: d1fa4a3ced98961674a441930a51f2d3
112 Content-length: 36
114 PROPS-END
115 This is the file 'alpha'.
118 Node-path: trunk/A/B/E/beta
119 Node-kind: file
120 Node-action: add
121 Prop-content-length: 10
122 Text-content-length: 25
123 Text-content-md5: 67c756078f24f946f6ec2d00d02f50e1
124 Content-length: 35
126 PROPS-END
127 This is the file 'beta'.
130 Node-path: trunk/A/B/F
131 Node-kind: dir
132 Node-action: add
133 Prop-content-length: 10
134 Content-length: 10
136 PROPS-END
139 Node-path: trunk/A/B/lambda
140 Node-kind: file
141 Node-action: add
142 Prop-content-length: 10
143 Text-content-length: 27
144 Text-content-md5: 911c7a8d869b8c1e566f57da54d889c6
145 Content-length: 37
147 PROPS-END
148 This is the file 'lambda'.
151 Node-path: trunk/A/C
152 Node-kind: dir
153 Node-action: add
154 Prop-content-length: 10
155 Content-length: 10
157 PROPS-END
160 Node-path: trunk/A/D
161 Node-kind: dir
162 Node-action: add
163 Prop-content-length: 10
164 Content-length: 10
166 PROPS-END
169 Node-path: trunk/A/D/G
170 Node-kind: dir
171 Node-action: add
172 Prop-content-length: 10
173 Content-length: 10
175 PROPS-END
178 Node-path: trunk/A/D/G/pi
179 Node-kind: file
180 Node-action: add
181 Prop-content-length: 10
182 Text-content-length: 23
183 Text-content-md5: adddfc3e6b605b5f90ceeab11b4e8ab6
184 Content-length: 33
186 PROPS-END
187 This is the file 'pi'.
190 Node-path: trunk/A/D/G/rho
191 Node-kind: file
192 Node-action: add
193 Prop-content-length: 10
194 Text-content-length: 24
195 Text-content-md5: 82f2211cf4ab22e3555fc7b835fbc604
196 Content-length: 34
198 PROPS-END
199 This is the file 'rho'.
202 Node-path: trunk/A/D/G/tau
203 Node-kind: file
204 Node-action: add
205 Prop-content-length: 10
206 Text-content-length: 24
207 Text-content-md5: 9936e2716e469bb686deb98c280ead58
208 Content-length: 34
210 PROPS-END
211 This is the file 'tau'.
214 Node-path: trunk/A/D/H
215 Node-kind: dir
216 Node-action: add
217 Prop-content-length: 10
218 Content-length: 10
220 PROPS-END
223 Node-path: trunk/A/D/H/chi
224 Node-kind: file
225 Node-action: add
226 Prop-content-length: 10
227 Text-content-length: 24
228 Text-content-md5: 8f5ebad6d1f7775c2682e54417cbe4d3
229 Content-length: 34
231 PROPS-END
232 This is the file 'chi'.
235 Node-path: trunk/A/D/H/omega
236 Node-kind: file
237 Node-action: add
238 Prop-content-length: 10
239 Text-content-length: 26
240 Text-content-md5: fe4ec8bdd3d2056db4f55b474a10fadc
241 Content-length: 36
243 PROPS-END
244 This is the file 'omega'.
247 Node-path: trunk/A/D/H/psi
248 Node-kind: file
249 Node-action: add
250 Prop-content-length: 10
251 Text-content-length: 24
252 Text-content-md5: e81f8f68ba50e749c200cb3c9ce5d2b1
253 Content-length: 34
255 PROPS-END
256 This is the file 'psi'.
259 Node-path: trunk/A/D/gamma
260 Node-kind: file
261 Node-action: add
262 Prop-content-length: 10
263 Text-content-length: 26
264 Text-content-md5: 412138bd677d64cd1c32fafbffe6245d
265 Content-length: 36
267 PROPS-END
268 This is the file 'gamma'.
271 Node-path: trunk/A/mu
272 Node-kind: file
273 Node-action: add
274 Prop-content-length: 10
275 Text-content-length: 23
276 Text-content-md5: baf78ae06a2d5b7d9554c5f1280d3fa8
277 Content-length: 33
279 PROPS-END
280 This is the file 'mu'.
283 Node-path: trunk/iota
284 Node-kind: file
285 Node-action: add
286 Prop-content-length: 10
287 Text-content-length: 25
288 Text-content-md5: 2d18c5e57e84c5b8a5e9a6e13fa394dc
289 Content-length: 35
291 PROPS-END
292 This is the file 'iota'.
295 Revision-number: 3
296 Prop-content-length: 130
297 Content-length: 130
299 K 7
300 svn:log
301 V 28
302 Create branches/a from trunk
303 K 10
304 svn:author
305 V 7
306 jrandom
307 K 8
308 svn:date
309 V 27
310 2007-06-07T16:47:59.887391Z
311 PROPS-END
313 Node-path: branches/a
314 Node-kind: dir
315 Node-action: add
316 Node-copyfrom-rev: 2
317 Node-copyfrom-path: trunk
318 Prop-content-length: 45
319 Content-length: 45
321 K 13
322 svn:mergeinfo
323 V 10
324 /trunk:1-2
325 PROPS-END
328 Revision-number: 4
329 Prop-content-length: 155
330 Content-length: 155
332 K 7
333 svn:log
334 V 53
335 Add the file 'upsilon', and change some other files.
337 K 10
338 svn:author
339 V 7
340 jrandom
341 K 8
342 svn:date
343 V 27
344 2007-06-07T16:53:26.421751Z
345 PROPS-END
347 Node-path: branches/a/A/mu
348 Node-kind: file
349 Node-action: change
350 Text-content-length: 63
351 Text-content-md5: 23eb7c223d7720a18c03eba9871efc1a
352 Content-length: 63
354 This is the file 'mu'.
355 Don't forget to look at 'upsilon', too.
358 Node-path: branches/a/A/upsilon
359 Node-kind: file
360 Node-action: add
361 Prop-content-length: 40
362 Text-content-length: 28
363 Text-content-md5: 6b763098e647d6ca29998d04d27464f1
364 Content-length: 68
366 K 13
367 svn:eol-style
368 V 6
369 native
370 PROPS-END
371 This is the file 'upsilon'.
374 Node-path: branches/a/iota
375 Node-kind: file
376 Node-action: change
377 Text-content-length: 48
378 Text-content-md5: 8e14aba230a0cb7f59c3855696f85f53
379 Content-length: 48
381 This is the file 'iota'.
382 'A' has changed a bit.
385 Revision-number: 5
386 Prop-content-length: 130
387 Content-length: 130
389 K 7
390 svn:log
391 V 28
392 Create branches/c from trunk
393 K 10
394 svn:author
395 V 7
396 jrandom
397 K 8
398 svn:date
399 V 27
400 2007-06-07T16:55:53.015135Z
401 PROPS-END
403 Node-path: branches/c
404 Node-kind: dir
405 Node-action: add
406 Node-copyfrom-rev: 4
407 Node-copyfrom-path: trunk
408 Prop-content-length: 45
409 Content-length: 45
411 K 13
412 svn:mergeinfo
413 V 10
414 /trunk:1-4
415 PROPS-END
418 Revision-number: 6
419 Prop-content-length: 128
420 Content-length: 128
422 K 7
423 svn:log
424 V 26
425 Merged branches/a to trunk
426 K 10
427 svn:author
428 V 7
429 jrandom
430 K 8
431 svn:date
432 V 27
433 2007-06-07T16:57:08.881980Z
434 PROPS-END
436 Node-path: trunk
437 Node-kind: dir
438 Node-action: change
439 Prop-content-length: 50
440 Content-length: 50
442 K 13
443 svn:mergeinfo
444 V 15
445 /branches/a:4-5
446 PROPS-END
449 Node-path: trunk/A/mu
450 Node-kind: file
451 Node-action: change
452 Text-content-length: 63
453 Text-content-md5: 23eb7c223d7720a18c03eba9871efc1a
454 Content-length: 63
456 This is the file 'mu'.
457 Don't forget to look at 'upsilon', too.
460 Node-path: trunk/A/upsilon
461 Node-kind: file
462 Node-action: add
463 Node-copyfrom-rev: 5
464 Node-copyfrom-path: branches/a/A/upsilon
467 Node-path: trunk/iota
468 Node-kind: file
469 Node-action: change
470 Text-content-length: 48
471 Text-content-md5: 8e14aba230a0cb7f59c3855696f85f53
472 Content-length: 48
474 This is the file 'iota'.
475 'A' has changed a bit.
478 Revision-number: 7
479 Prop-content-length: 167
480 Content-length: 167
482 K 7
483 svn:log
484 V 65
485 Add omicron to branches/a.  It will be blocked from merging in r8
486 K 10
487 svn:author
488 V 7
489 jrandom
490 K 8
491 svn:date
492 V 27
493 2007-06-07T17:06:21.449779Z
494 PROPS-END
496 Node-path: branches/a/blocked
497 Node-kind: dir
498 Node-action: add
499 Prop-content-length: 10
500 Content-length: 10
502 PROPS-END
505 Node-path: branches/a/blocked/omicron
506 Node-kind: file
507 Node-action: add
508 Prop-content-length: 40
509 Text-content-length: 71
510 Text-content-md5: 48891f2d6e885307206081af410948fa
511 Content-length: 111
513 K 13
514 svn:eol-style
515 V 6
516 native
517 PROPS-END
518 This is the file 'omicron'.
519 It should never be merged to trunk.  Ever.
522 Revision-number: 8
523 Prop-content-length: 132
524 Content-length: 132
526 K 7
527 svn:log
528 V 30
529 Block r7 from merging to trunk
530 K 10
531 svn:author
532 V 7
533 jrandom
534 K 8
535 svn:date
536 V 27
537 2007-06-07T17:07:17.723195Z
538 PROPS-END
540 Node-path: trunk
541 Node-kind: dir
542 Node-action: change
543 Prop-content-length: 52
544 Content-length: 52
546 K 13
547 svn:mergeinfo
548 V 17
549 /branches/a:4-5,7
550 PROPS-END
553 Revision-number: 9
554 Prop-content-length: 127
555 Content-length: 127
557 K 7
558 svn:log
559 V 25
560 Wording change in upsilon
561 K 10
562 svn:author
563 V 7
564 jrandom
565 K 8
566 svn:date
567 V 27
568 2007-06-07T17:09:08.430558Z
569 PROPS-END
571 Node-path: trunk/A/mu
572 Node-kind: file
573 Node-action: change
574 Text-content-length: 67
575 Text-content-md5: abaacf1a39701ef1b3a6fe62c2886d9a
576 Content-length: 67
578 This is the file 'mu'.
579 Don't forget to look at 'upsilon', as well.
582 Revision-number: 10
583 Prop-content-length: 130
584 Content-length: 130
586 K 7
587 svn:log
588 V 28
589 Create branches/b from trunk
590 K 10
591 svn:author
592 V 7
593 jrandom
594 K 8
595 svn:date
596 V 27
597 2007-06-07T17:09:34.280289Z
598 PROPS-END
600 Node-path: branches/b
601 Node-kind: dir
602 Node-action: add
603 Node-copyfrom-rev: 9
604 Node-copyfrom-path: trunk
605 Prop-content-length: 63
606 Content-length: 63
608 K 13
609 svn:mergeinfo
610 V 28
611 /branches/a:4-5,7
612 /trunk:1-9
613 PROPS-END
616 Revision-number: 11
617 Prop-content-length: 153
618 Content-length: 153
620 K 7
621 svn:log
622 V 51
623 Added 'xi' to branches/a, made a few other changes.
624 K 10
625 svn:author
626 V 7
627 jrandom
628 K 8
629 svn:date
630 V 27
631 2007-06-07T17:24:53.981098Z
632 PROPS-END
634 Node-path: branches/a/A/upsilon
635 Node-kind: file
636 Node-action: change
637 Text-content-length: 57
638 Text-content-md5: a359d764a415ba284e1a8a7a11d4b70c
639 Content-length: 57
641 This is the file 'upsilon'.
642 There is also the file 'xi'.
645 Node-path: branches/a/A/xi
646 Node-kind: file
647 Node-action: add
648 Prop-content-length: 40
649 Text-content-length: 23
650 Text-content-md5: b1f53247c73296e74ab55bb07f2be3c7
651 Content-length: 63
653 K 13
654 svn:eol-style
655 V 6
656 native
657 PROPS-END
658 This is the file 'xi'.
661 Node-path: branches/a/iota
662 Node-kind: file
663 Node-action: change
664 Text-content-length: 74
665 Text-content-md5: 22d7c4a14c82aaeae285c3bbcb59f00a
666 Content-length: 74
668 This is the file 'iota'.
669 'A' has changed a bit, with 'upsilon', and 'xi'.
672 Revision-number: 12
673 Prop-content-length: 132
674 Content-length: 132
676 K 7
677 svn:log
678 V 30
679 Merge branches/a to branches/b
680 K 10
681 svn:author
682 V 7
683 jrandom
684 K 8
685 svn:date
686 V 27
687 2007-06-07T17:27:29.282205Z
688 PROPS-END
690 Node-path: branches/b
691 Node-kind: dir
692 Node-action: change
693 Prop-content-length: 62
694 Content-length: 62
696 K 13
697 svn:mergeinfo
698 V 27
699 /branches/a:4-11
700 /trunk:1-9
701 PROPS-END
704 Node-path: branches/b/A/upsilon
705 Node-kind: file
706 Node-action: change
707 Text-content-length: 57
708 Text-content-md5: a359d764a415ba284e1a8a7a11d4b70c
709 Content-length: 57
711 This is the file 'upsilon'.
712 There is also the file 'xi'.
715 Node-path: branches/b/A/xi
716 Node-kind: file
717 Node-action: add
718 Node-copyfrom-rev: 11
719 Node-copyfrom-path: branches/a/A/xi
722 Node-path: branches/b/iota
723 Node-kind: file
724 Node-action: change
725 Text-content-length: 74
726 Text-content-md5: 22d7c4a14c82aaeae285c3bbcb59f00a
727 Content-length: 74
729 This is the file 'iota'.
730 'A' has changed a bit, with 'upsilon', and 'xi'.
733 Revision-number: 13
734 Prop-content-length: 130
735 Content-length: 130
737 K 7
738 svn:log
739 V 28
740 Modify 'gamma' on branches/b
741 K 10
742 svn:author
743 V 7
744 jrandom
745 K 8
746 svn:date
747 V 27
748 2007-06-07T17:28:54.002971Z
749 PROPS-END
751 Node-path: branches/b/A/D/gamma
752 Node-kind: file
753 Node-action: change
754 Text-content-length: 50
755 Text-content-md5: 247e91a143e6dce3dd2c41860a73a865
756 Content-length: 50
758 This is the file 'gamma'.
759 Watch out for the rays!
762 Revision-number: 14
763 Prop-content-length: 127
764 Content-length: 127
766 K 7
767 svn:log
768 V 25
769 Merge branches/b to trunk
770 K 10
771 svn:author
772 V 7
773 jrandom
774 K 8
775 svn:date
776 V 27
777 2007-06-07T17:29:48.480221Z
778 PROPS-END
780 Node-path: trunk
781 Node-kind: dir
782 Node-action: change
783 Prop-content-length: 70
784 Content-length: 70
786 K 13
787 svn:mergeinfo
788 V 35
789 /branches/a:4-5,7
790 /branches/b:11-13
791 PROPS-END
794 Node-path: trunk/A/D/gamma
795 Node-kind: file
796 Node-action: change
797 Text-content-length: 50
798 Text-content-md5: 247e91a143e6dce3dd2c41860a73a865
799 Content-length: 50
801 This is the file 'gamma'.
802 Watch out for the rays!
805 Node-path: trunk/A/upsilon
806 Node-kind: file
807 Node-action: change
808 Text-content-length: 57
809 Text-content-md5: a359d764a415ba284e1a8a7a11d4b70c
810 Content-length: 57
812 This is the file 'upsilon'.
813 There is also the file 'xi'.
816 Node-path: trunk/A/xi
817 Node-kind: file
818 Node-action: add
819 Node-copyfrom-rev: 13
820 Node-copyfrom-path: branches/b/A/xi
823 Node-path: trunk/iota
824 Node-kind: file
825 Node-action: change
826 Text-content-length: 74
827 Text-content-md5: 22d7c4a14c82aaeae285c3bbcb59f00a
828 Content-length: 74
830 This is the file 'iota'.
831 'A' has changed a bit, with 'upsilon', and 'xi'.
834 Revision-number: 15
835 Prop-content-length: 140
836 Content-length: 140
838 K 7
839 svn:log
840 V 38
841 Bring branches/c up to date with trunk
842 K 10
843 svn:author
844 V 7
845 jrandom
846 K 8
847 svn:date
848 V 27
849 2007-06-07T17:30:42.460106Z
850 PROPS-END
852 Node-path: branches/c
853 Node-kind: dir
854 Node-action: change
855 Prop-content-length: 46
856 Content-length: 46
858 K 13
859 svn:mergeinfo
860 V 11
861 /trunk:1-14
862 PROPS-END
865 Node-path: branches/c/A/D/gamma
866 Node-kind: file
867 Node-action: change
868 Text-content-length: 50
869 Text-content-md5: 247e91a143e6dce3dd2c41860a73a865
870 Content-length: 50
872 This is the file 'gamma'.
873 Watch out for the rays!
876 Node-path: branches/c/A/mu
877 Node-kind: file
878 Node-action: change
879 Text-content-length: 67
880 Text-content-md5: abaacf1a39701ef1b3a6fe62c2886d9a
881 Content-length: 67
883 This is the file 'mu'.
884 Don't forget to look at 'upsilon', as well.
887 Node-path: branches/c/A/upsilon
888 Node-kind: file
889 Node-action: add
890 Node-copyfrom-rev: 14
891 Node-copyfrom-path: trunk/A/upsilon
894 Node-path: branches/c/A/xi
895 Node-kind: file
896 Node-action: add
897 Node-copyfrom-rev: 14
898 Node-copyfrom-path: trunk/A/xi
901 Node-path: branches/c/iota
902 Node-kind: file
903 Node-action: change
904 Text-content-length: 74
905 Text-content-md5: 22d7c4a14c82aaeae285c3bbcb59f00a
906 Content-length: 74
908 This is the file 'iota'.
909 'A' has changed a bit, with 'upsilon', and 'xi'.
912 Revision-number: 16
913 Prop-content-length: 127
914 Content-length: 127
916 K 7
917 svn:log
918 V 25
919 Modify 'mu' on branches/c
920 K 10
921 svn:author
922 V 7
923 jrandom
924 K 8
925 svn:date
926 V 27
927 2007-06-07T17:35:16.918823Z
928 PROPS-END
930 Node-path: branches/c/A/mu
931 Node-kind: file
932 Node-action: change
933 Text-content-length: 101
934 Text-content-md5: 872c3904e87009950cbb644699397a21
935 Content-length: 101
937 This is the file 'mu'.
938 Don't forget to look at 'upsilon', as well.
939 This is yet more content in 'mu'.
942 Revision-number: 17
943 Prop-content-length: 157
944 Content-length: 157
946 K 7
947 svn:log
948 V 55
949 Merge branches/c to trunk, resolving a conflict on 'mu'
950 K 10
951 svn:author
952 V 7
953 jrandom
954 K 8
955 svn:date
956 V 27
957 2007-06-07T17:38:21.904635Z
958 PROPS-END
960 Node-path: trunk
961 Node-kind: dir
962 Node-action: change
963 Prop-content-length: 87
964 Content-length: 87
966 K 13
967 svn:mergeinfo
968 V 52
969 /branches/a:4-5,7
970 /branches/b:11-13
971 /branches/c:6-16
972 PROPS-END
975 Node-path: trunk/A/mu
976 Node-kind: file
977 Node-action: change
978 Text-content-length: 101
979 Text-content-md5: 872c3904e87009950cbb644699397a21
980 Content-length: 101
982 This is the file 'mu'.
983 Don't forget to look at 'upsilon', as well.
984 This is yet more content in 'mu'.