]> git.ipfire.org Git - thirdparty/git.git/blame - t/t9151/svn-mergeinfo.dump
Merge branch 'dl/checkout-p-merge-base'
[thirdparty/git.git] / t / t9151 / svn-mergeinfo.dump
CommitLineData
ce626830
SV
1SVN-fs-dump-format-version: 2
2
c79f1189 3UUID: d6191530-2693-4a8e-98e7-b194d4c3edd8
ce626830
SV
4
5Revision-number: 0
6Prop-content-length: 56
7Content-length: 56
8
9K 8
10svn:date
11V 27
c79f1189 122010-01-19T04:14:02.832406Z
ce626830
SV
13PROPS-END
14
15Revision-number: 1
c79f1189
AM
16Prop-content-length: 134
17Content-length: 134
ce626830
SV
18
19K 7
20svn:log
c79f1189
AM
21V 36
22(r1) Setup trunk, branches, and tags
ce626830
SV
23K 10
24svn:author
c79f1189
AM
25V 3
26adm
ce626830
SV
27K 8
28svn:date
29V 27
c79f1189 302010-01-19T04:14:03.055172Z
ce626830
SV
31PROPS-END
32
33Node-path: branches
34Node-kind: dir
35Node-action: add
36Prop-content-length: 10
37Content-length: 10
38
39PROPS-END
40
41
c79f1189
AM
42Node-path: tags
43Node-kind: dir
44Node-action: add
45Prop-content-length: 10
46Content-length: 10
47
48PROPS-END
49
50
ce626830
SV
51Node-path: trunk
52Node-kind: dir
53Node-action: add
54Prop-content-length: 10
55Content-length: 10
56
57PROPS-END
58
59
60Revision-number: 2
c79f1189
AM
61Prop-content-length: 111
62Content-length: 111
ce626830
SV
63
64K 7
65svn:log
1d144aa2
SV
66V 13
67(r2) ancestor
ce626830
SV
68K 10
69svn:author
c79f1189
AM
70V 3
71adm
ce626830
SV
72K 8
73svn:date
74V 27
c79f1189 752010-01-19T04:14:04.064506Z
ce626830
SV
76PROPS-END
77
78Node-path: trunk/Makefile
79Node-kind: file
80Node-action: add
81Prop-content-length: 10
82Text-content-length: 2401
83Text-content-md5: bfd8ff778d1492dc6758567373176a89
753dc384 84Text-content-sha1: 103205ce331f7d64086dba497574734f78439590
ce626830
SV
85Content-length: 2411
86
87PROPS-END
88# -DCOLLISION_CHECK if you believe that SHA1's
89# 1461501637330902918203684832716283019655932542976 hashes do not give you
90# enough guarantees about no collisions between objects ever hapenning.
91#
92# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
93# Note that you need some new glibc (at least >2.2.4) for this, and it will
94# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
95# break unless your underlying filesystem supports those sub-second times
96# (my ext3 doesn't).
97CFLAGS=-g -O3 -Wall
98
99CC=gcc
100
101
102PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
103 cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
104 check-files ls-tree merge-base
105
106all: $(PROG)
107
108install: $(PROG)
109 install $(PROG) $(HOME)/bin/
110
111LIBS= -lssl -lz
112
113init-db: init-db.o
114
115update-cache: update-cache.o read-cache.o
116 $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
117
118show-diff: show-diff.o read-cache.o
119 $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
120
121write-tree: write-tree.o read-cache.o
122 $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
123
124read-tree: read-tree.o read-cache.o
125 $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
126
127commit-tree: commit-tree.o read-cache.o
128 $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
129
130cat-file: cat-file.o read-cache.o
131 $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
132
133fsck-cache: fsck-cache.o read-cache.o
134 $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
135
136checkout-cache: checkout-cache.o read-cache.o
137 $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
138
139diff-tree: diff-tree.o read-cache.o
140 $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
141
142rev-tree: rev-tree.o read-cache.o
143 $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
144
145show-files: show-files.o read-cache.o
146 $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
147
148check-files: check-files.o read-cache.o
149 $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
150
151ls-tree: ls-tree.o read-cache.o
152 $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
153
154merge-base: merge-base.o read-cache.o
155 $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
156
157read-cache.o: cache.h
158show-diff.o: cache.h
159
160clean:
161 rm -f *.o $(PROG)
162
163backup: clean
164 cd .. ; tar czvf dircache.tar.gz dir-cache
165
166
167Revision-number: 3
c79f1189
AM
168Prop-content-length: 119
169Content-length: 119
ce626830
SV
170
171K 7
172svn:log
1d144aa2
SV
173V 21
174(r3) make left branch
ce626830
SV
175K 10
176svn:author
c79f1189
AM
177V 3
178adm
ce626830
SV
179K 8
180svn:date
181V 27
c79f1189 1822010-01-19T04:14:06.040389Z
ce626830
SV
183PROPS-END
184
185Node-path: branches/left
186Node-kind: dir
187Node-action: add
188Node-copyfrom-rev: 1
189Node-copyfrom-path: trunk
ce626830 190
ce626830 191
753dc384
TA
192Node-path: branches/left/Makefile
193Node-kind: file
194Node-action: add
195Node-copyfrom-rev: 2
196Node-copyfrom-path: trunk/Makefile
197Text-copy-source-md5: bfd8ff778d1492dc6758567373176a89
198Text-copy-source-sha1: 103205ce331f7d64086dba497574734f78439590
199
200
201Revision-number: 4
c79f1189
AM
202Prop-content-length: 120
203Content-length: 120
753dc384
TA
204
205K 7
206svn:log
1d144aa2
SV
207V 22
208(r4) make right branch
753dc384
TA
209K 10
210svn:author
c79f1189
AM
211V 3
212adm
753dc384
TA
213K 8
214svn:date
215V 27
c79f1189 2162010-01-19T04:14:08.040905Z
ce626830
SV
217PROPS-END
218
753dc384
TA
219Node-path: branches/right
220Node-kind: dir
221Node-action: add
222Node-copyfrom-rev: 1
223Node-copyfrom-path: trunk
224
ce626830 225
753dc384 226Node-path: branches/right/Makefile
ce626830
SV
227Node-kind: file
228Node-action: add
229Node-copyfrom-rev: 2
230Node-copyfrom-path: trunk/Makefile
231Text-copy-source-md5: bfd8ff778d1492dc6758567373176a89
753dc384 232Text-copy-source-sha1: 103205ce331f7d64086dba497574734f78439590
ce626830
SV
233
234
753dc384 235Revision-number: 5
c79f1189
AM
236Prop-content-length: 116
237Content-length: 116
ce626830
SV
238
239K 7
240svn:log
1d144aa2
SV
241V 18
242(r5) left update 1
ce626830
SV
243K 10
244svn:author
c79f1189
AM
245V 3
246adm
ce626830
SV
247K 8
248svn:date
249V 27
c79f1189 2502010-01-19T04:14:09.049169Z
ce626830
SV
251PROPS-END
252
253Node-path: branches/left/Makefile
254Node-kind: file
255Node-action: change
256Text-content-length: 2465
257Text-content-md5: 16e38d9753b061731650561ce01b1195
753dc384 258Text-content-sha1: 36da4b84ea9b64218ab48171dfc5c48ae025f38b
ce626830
SV
259Content-length: 2465
260
261# -DCOLLISION_CHECK if you believe that SHA1's
262# 1461501637330902918203684832716283019655932542976 hashes do not give you
263# enough guarantees about no collisions between objects ever hapenning.
264#
265# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
266# Note that you need some new glibc (at least >2.2.4) for this, and it will
267# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
268# break unless your underlying filesystem supports those sub-second times
269# (my ext3 doesn't).
270CFLAGS=-g -O3 -Wall
271
272CC=gcc
273
274
275PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
276 cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
277 check-files ls-tree merge-base
278
279all: $(PROG)
280
281install: $(PROG)
282 install $(PROG) $(HOME)/bin/
283
284LIBS= -lssl -lz
285
286init-db: init-db.o
287
288update-cache: update-cache.o read-cache.o
289 $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
290
291show-diff: show-diff.o read-cache.o
292 $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
293
294write-tree: write-tree.o read-cache.o
295 $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
296
297read-tree: read-tree.o read-cache.o
298 $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
299
300commit-tree: commit-tree.o read-cache.o
301 $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
302
303cat-file: cat-file.o read-cache.o
304 $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
305
306fsck-cache: fsck-cache.o read-cache.o
307 $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
308
309checkout-cache: checkout-cache.o read-cache.o
310 $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
311
312diff-tree: diff-tree.o read-cache.o
313 $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
314
315rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
316 $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
317
318show-files: show-files.o read-cache.o
319 $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
320
321check-files: check-files.o read-cache.o
322 $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
323
324ls-tree: ls-tree.o read-cache.o
325 $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
326
327merge-base: merge-base.o read-cache.o
328 $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
329
330read-cache.o: cache.h
331show-diff.o: cache.h
332
333clean:
334 rm -f *.o $(PROG)
335
336backup: clean
337 cd .. ; tar czvf dircache.tar.gz dir-cache
338
339
753dc384 340Revision-number: 6
c79f1189
AM
341Prop-content-length: 117
342Content-length: 117
ce626830
SV
343
344K 7
345svn:log
1d144aa2
SV
346V 19
347(r6) right update 1
ce626830
SV
348K 10
349svn:author
c79f1189
AM
350V 3
351adm
ce626830
SV
352K 8
353svn:date
354V 27
c79f1189 3552010-01-19T04:14:10.049350Z
ce626830
SV
356PROPS-END
357
1d144aa2 358Node-path: branches/right/Makefile
ce626830
SV
359Node-kind: file
360Node-action: change
361Text-content-length: 2521
362Text-content-md5: 0668418a621333f4aa8b6632cd63e2a0
753dc384 363Text-content-sha1: 4f29afd038e52f45acb5ef8c41acfc70062a741a
ce626830
SV
364Content-length: 2521
365
366# -DCOLLISION_CHECK if you believe that SHA1's
367# 1461501637330902918203684832716283019655932542976 hashes do not give you
368# enough guarantees about no collisions between objects ever hapenning.
369#
370# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
371# Note that you need some new glibc (at least >2.2.4) for this, and it will
372# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
373# break unless your underlying filesystem supports those sub-second times
374# (my ext3 doesn't).
375CFLAGS=-g -O3 -Wall
376
377CC=gcc
378
379
380PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
381 cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
382 check-files ls-tree merge-base merge-cache
383
384all: $(PROG)
385
386install: $(PROG)
387 install $(PROG) $(HOME)/bin/
388
389LIBS= -lssl -lz
390
391init-db: init-db.o
392
393update-cache: update-cache.o read-cache.o
394 $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
395
396show-diff: show-diff.o read-cache.o
397 $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
398
399write-tree: write-tree.o read-cache.o
400 $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
401
402read-tree: read-tree.o read-cache.o
403 $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
404
405commit-tree: commit-tree.o read-cache.o
406 $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
407
408cat-file: cat-file.o read-cache.o
409 $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
410
411fsck-cache: fsck-cache.o read-cache.o
412 $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
413
414checkout-cache: checkout-cache.o read-cache.o
415 $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
416
417diff-tree: diff-tree.o read-cache.o
418 $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
419
420rev-tree: rev-tree.o read-cache.o
421 $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
422
423show-files: show-files.o read-cache.o
424 $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
425
426check-files: check-files.o read-cache.o
427 $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
428
429ls-tree: ls-tree.o read-cache.o
430 $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
431
432merge-base: merge-base.o read-cache.o
433 $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
434
435merge-cache: merge-cache.o read-cache.o
436 $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
437
438read-cache.o: cache.h
439show-diff.o: cache.h
440
441clean:
442 rm -f *.o $(PROG)
443
444backup: clean
445 cd .. ; tar czvf dircache.tar.gz dir-cache
446
447
753dc384 448Revision-number: 7
c79f1189
AM
449Prop-content-length: 116
450Content-length: 116
ce626830
SV
451
452K 7
453svn:log
1d144aa2
SV
454V 18
455(r7) left update 2
ce626830
SV
456K 10
457svn:author
c79f1189
AM
458V 3
459adm
ce626830
SV
460K 8
461svn:date
462V 27
c79f1189 4632010-01-19T04:14:11.049209Z
ce626830
SV
464PROPS-END
465
466Node-path: branches/left/Makefile
467Node-kind: file
468Node-action: change
469Text-content-length: 2529
470Text-content-md5: f6b197cc3f2e89a83e545d4bb003de73
753dc384 471Text-content-sha1: 2f656677cfec0bceec85e53036ffb63e25126f8e
ce626830
SV
472Content-length: 2529
473
474# -DCOLLISION_CHECK if you believe that SHA1's
475# 1461501637330902918203684832716283019655932542976 hashes do not give you
476# enough guarantees about no collisions between objects ever hapenning.
477#
478# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
479# Note that you need some new glibc (at least >2.2.4) for this, and it will
480# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
481# break unless your underlying filesystem supports those sub-second times
482# (my ext3 doesn't).
483CFLAGS=-g -O3 -Wall
484
485CC=gcc
486
487
488PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
489 cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
490 check-files ls-tree merge-base
491
492all: $(PROG)
493
494install: $(PROG)
495 install $(PROG) $(HOME)/bin/
496
497LIBS= -lssl -lz
498
499init-db: init-db.o
500
501update-cache: update-cache.o read-cache.o
502 $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
503
504show-diff: show-diff.o read-cache.o
505 $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
506
507write-tree: write-tree.o read-cache.o
508 $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
509
510read-tree: read-tree.o read-cache.o
511 $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
512
513commit-tree: commit-tree.o read-cache.o
514 $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
515
516cat-file: cat-file.o read-cache.o
517 $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
518
519fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
520 $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
521
522checkout-cache: checkout-cache.o read-cache.o
523 $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
524
525diff-tree: diff-tree.o read-cache.o
526 $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
527
528rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
529 $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
530
531show-files: show-files.o read-cache.o
532 $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
533
534check-files: check-files.o read-cache.o
535 $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
536
537ls-tree: ls-tree.o read-cache.o
538 $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
539
540merge-base: merge-base.o read-cache.o
541 $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
542
543read-cache.o: cache.h
544show-diff.o: cache.h
545
546clean:
547 rm -f *.o $(PROG)
548
549backup: clean
550 cd .. ; tar czvf dircache.tar.gz dir-cache
551
552
753dc384 553Revision-number: 8
c79f1189
AM
554Prop-content-length: 116
555Content-length: 116
ce626830
SV
556
557K 7
558svn:log
1d144aa2
SV
559V 18
560(r8) left update 3
ce626830
SV
561K 10
562svn:author
c79f1189
AM
563V 3
564adm
ce626830
SV
565K 8
566svn:date
567V 27
c79f1189 5682010-01-19T04:14:12.049234Z
ce626830
SV
569PROPS-END
570
571Node-path: branches/left/Makefile
572Node-kind: file
573Node-action: change
574Text-content-length: 2593
575Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba
753dc384 576Text-content-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
ce626830
SV
577Content-length: 2593
578
579# -DCOLLISION_CHECK if you believe that SHA1's
580# 1461501637330902918203684832716283019655932542976 hashes do not give you
581# enough guarantees about no collisions between objects ever hapenning.
582#
583# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
584# Note that you need some new glibc (at least >2.2.4) for this, and it will
585# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
586# break unless your underlying filesystem supports those sub-second times
587# (my ext3 doesn't).
588CFLAGS=-g -O3 -Wall
589
590CC=gcc
591
592
593PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
594 cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
595 check-files ls-tree merge-base
596
597all: $(PROG)
598
599install: $(PROG)
600 install $(PROG) $(HOME)/bin/
601
602LIBS= -lssl -lz
603
604init-db: init-db.o
605
606update-cache: update-cache.o read-cache.o
607 $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
608
609show-diff: show-diff.o read-cache.o
610 $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
611
612write-tree: write-tree.o read-cache.o
613 $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
614
615read-tree: read-tree.o read-cache.o
616 $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
617
618commit-tree: commit-tree.o read-cache.o
619 $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
620
621cat-file: cat-file.o read-cache.o
622 $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
623
624fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
625 $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
626
627checkout-cache: checkout-cache.o read-cache.o
628 $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
629
630diff-tree: diff-tree.o read-cache.o
631 $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
632
633rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
634 $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
635
636show-files: show-files.o read-cache.o
637 $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
638
639check-files: check-files.o read-cache.o
640 $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
641
642ls-tree: ls-tree.o read-cache.o
643 $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
644
645merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
646 $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
647
648read-cache.o: cache.h
649show-diff.o: cache.h
650
651clean:
652 rm -f *.o $(PROG)
653
654backup: clean
655 cd .. ; tar czvf dircache.tar.gz dir-cache
656
657
753dc384 658Revision-number: 9
c79f1189
AM
659Prop-content-length: 123
660Content-length: 123
ce626830
SV
661
662K 7
663svn:log
1d144aa2
SV
664V 25
665(r9) make left sub-branch
666K 10
667svn:author
c79f1189
AM
668V 3
669adm
1d144aa2
SV
670K 8
671svn:date
672V 27
c79f1189 6732010-01-19T04:14:14.040894Z
1d144aa2
SV
674PROPS-END
675
676Node-path: branches/left-sub
677Node-kind: dir
678Node-action: add
679Node-copyfrom-rev: 3
680Node-copyfrom-path: branches/left
681
682
683Node-path: branches/left-sub/Makefile
684Node-kind: file
685Node-action: delete
686
687Node-path: branches/left-sub/Makefile
688Node-kind: file
689Node-action: add
690Node-copyfrom-rev: 8
691Node-copyfrom-path: branches/left/Makefile
692Text-copy-source-md5: 5ccff689fb290e00b85fe18ee50c54ba
693Text-copy-source-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
694
695
696
697
698Revision-number: 10
c79f1189
AM
699Prop-content-length: 128
700Content-length: 128
1d144aa2
SV
701
702K 7
703svn:log
704V 30
705(r10) left sub-branch update 1
ce626830
SV
706K 10
707svn:author
c79f1189
AM
708V 3
709adm
ce626830
SV
710K 8
711svn:date
712V 27
c79f1189 7132010-01-19T04:14:15.049935Z
1d144aa2
SV
714PROPS-END
715
716Node-path: branches/left-sub/README
717Node-kind: file
718Node-action: add
719Prop-content-length: 10
720Text-content-length: 7
721Text-content-md5: fdbcfb6be9afe1121862143f226b51cf
722Text-content-sha1: 1d1f5ea4ceb584337ffe59b8980d92e3b78dfef4
723Content-length: 17
724
725PROPS-END
726crunch
727
728
729Revision-number: 11
c79f1189
AM
730Prop-content-length: 125
731Content-length: 125
1d144aa2
SV
732
733K 7
734svn:log
735V 27
736(r11) Merge left to trunk 1
737K 10
738svn:author
c79f1189
AM
739V 3
740adm
1d144aa2
SV
741K 8
742svn:date
743V 27
c79f1189 7442010-01-19T04:14:18.056594Z
ce626830
SV
745PROPS-END
746
747Node-path: trunk
748Node-kind: dir
749Node-action: change
1d144aa2
SV
750Prop-content-length: 54
751Content-length: 54
ce626830
SV
752
753K 13
754svn:mergeinfo
1d144aa2
SV
755V 19
756/branches/left:2-10
757PROPS-END
758
759
760Node-path: trunk/Makefile
761Node-kind: file
762Node-action: change
763Text-content-length: 2593
764Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba
765Text-content-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
766Content-length: 2593
767
768# -DCOLLISION_CHECK if you believe that SHA1's
769# 1461501637330902918203684832716283019655932542976 hashes do not give you
770# enough guarantees about no collisions between objects ever hapenning.
771#
772# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
773# Note that you need some new glibc (at least >2.2.4) for this, and it will
774# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
775# break unless your underlying filesystem supports those sub-second times
776# (my ext3 doesn't).
777CFLAGS=-g -O3 -Wall
778
779CC=gcc
780
781
782PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
783 cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
784 check-files ls-tree merge-base
785
786all: $(PROG)
787
788install: $(PROG)
789 install $(PROG) $(HOME)/bin/
790
791LIBS= -lssl -lz
792
793init-db: init-db.o
794
795update-cache: update-cache.o read-cache.o
796 $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
797
798show-diff: show-diff.o read-cache.o
799 $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
800
801write-tree: write-tree.o read-cache.o
802 $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
803
804read-tree: read-tree.o read-cache.o
805 $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
806
807commit-tree: commit-tree.o read-cache.o
808 $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
809
810cat-file: cat-file.o read-cache.o
811 $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
812
813fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
814 $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
815
816checkout-cache: checkout-cache.o read-cache.o
817 $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
818
819diff-tree: diff-tree.o read-cache.o
820 $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
821
822rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
823 $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
824
825show-files: show-files.o read-cache.o
826 $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
827
828check-files: check-files.o read-cache.o
829 $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
830
831ls-tree: ls-tree.o read-cache.o
832 $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
833
834merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
835 $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
836
837read-cache.o: cache.h
838show-diff.o: cache.h
839
840clean:
841 rm -f *.o $(PROG)
842
843backup: clean
844 cd .. ; tar czvf dircache.tar.gz dir-cache
845
846
847Revision-number: 12
c79f1189
AM
848Prop-content-length: 117
849Content-length: 117
1d144aa2
SV
850
851K 7
852svn:log
853V 19
854(r12) left update 4
855K 10
856svn:author
c79f1189
AM
857V 3
858adm
1d144aa2
SV
859K 8
860svn:date
861V 27
c79f1189 8622010-01-19T04:14:19.049620Z
1d144aa2
SV
863PROPS-END
864
865Node-path: branches/left/zlonk
866Node-kind: file
867Node-action: add
868Prop-content-length: 10
869Text-content-length: 7
870Text-content-md5: 8b9d8c7c2aaa6167e7d3407a773bbbba
871Text-content-sha1: 9716527ebd70a75c27625cacbeb2d897c6e86178
872Content-length: 17
873
874PROPS-END
875touche
876
877
878Revision-number: 13
c79f1189
AM
879Prop-content-length: 118
880Content-length: 118
1d144aa2
SV
881
882K 7
883svn:log
884V 20
885(r13) right update 2
886K 10
887svn:author
c79f1189
AM
888V 3
889adm
1d144aa2
SV
890K 8
891svn:date
892V 27
c79f1189 8932010-01-19T04:14:20.049659Z
1d144aa2
SV
894PROPS-END
895
896Node-path: branches/right/bang
897Node-kind: file
898Node-action: add
899Prop-content-length: 10
900Text-content-length: 8
901Text-content-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
902Text-content-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
903Content-length: 18
904
905PROPS-END
906thwacke
907
908
909Revision-number: 14
c79f1189
AM
910Prop-content-length: 140
911Content-length: 140
1d144aa2
SV
912
913K 7
914svn:log
915V 42
916(r14) Cherry-pick right 2 commits to trunk
917K 10
918svn:author
c79f1189
AM
919V 3
920adm
1d144aa2
SV
921K 8
922svn:date
923V 27
c79f1189 9242010-01-19T04:14:23.041991Z
1d144aa2
SV
925PROPS-END
926
927Node-path: trunk
928Node-kind: dir
929Node-action: change
930Prop-content-length: 75
931Content-length: 75
932
933K 13
934svn:mergeinfo
935V 40
936/branches/left:2-10
937/branches/right:6-13
ce626830
SV
938PROPS-END
939
940
941Node-path: trunk/Makefile
942Node-kind: file
943Node-action: change
944Text-content-length: 2713
945Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
753dc384 946Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14
ce626830
SV
947Content-length: 2713
948
949# -DCOLLISION_CHECK if you believe that SHA1's
950# 1461501637330902918203684832716283019655932542976 hashes do not give you
951# enough guarantees about no collisions between objects ever hapenning.
952#
953# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
954# Note that you need some new glibc (at least >2.2.4) for this, and it will
955# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
956# break unless your underlying filesystem supports those sub-second times
957# (my ext3 doesn't).
958CFLAGS=-g -O3 -Wall
959
960CC=gcc
961
962
963PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
964 cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
965 check-files ls-tree merge-base merge-cache
966
967all: $(PROG)
968
969install: $(PROG)
970 install $(PROG) $(HOME)/bin/
971
972LIBS= -lssl -lz
973
974init-db: init-db.o
975
976update-cache: update-cache.o read-cache.o
977 $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
978
979show-diff: show-diff.o read-cache.o
980 $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
981
982write-tree: write-tree.o read-cache.o
983 $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
984
985read-tree: read-tree.o read-cache.o
986 $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
987
988commit-tree: commit-tree.o read-cache.o
989 $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
990
991cat-file: cat-file.o read-cache.o
992 $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
993
994fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
995 $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
996
997checkout-cache: checkout-cache.o read-cache.o
998 $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
999
1000diff-tree: diff-tree.o read-cache.o
1001 $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
1002
1003rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
1004 $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1005
1006show-files: show-files.o read-cache.o
1007 $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
1008
1009check-files: check-files.o read-cache.o
1010 $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
1011
1012ls-tree: ls-tree.o read-cache.o
1013 $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
1014
1015merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
1016 $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1017
1018merge-cache: merge-cache.o read-cache.o
1019 $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
1020
1021read-cache.o: cache.h
1022show-diff.o: cache.h
1023
1024clean:
1025 rm -f *.o $(PROG)
1026
1027backup: clean
1028 cd .. ; tar czvf dircache.tar.gz dir-cache
1029
1030
1d144aa2
SV
1031Node-path: trunk/bang
1032Node-kind: file
1033Node-action: add
1034Node-copyfrom-rev: 13
1035Node-copyfrom-path: branches/right/bang
1036Text-copy-source-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
1037Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
1038
1039
1040Revision-number: 15
c79f1189
AM
1041Prop-content-length: 126
1042Content-length: 126
753dc384
TA
1043
1044K 7
1045svn:log
1d144aa2
SV
1046V 28
1047(r15) Merge right to trunk 1
753dc384
TA
1048K 10
1049svn:author
c79f1189
AM
1050V 3
1051adm
753dc384
TA
1052K 8
1053svn:date
1054V 27
c79f1189 10552010-01-19T04:14:26.054456Z
753dc384
TA
1056PROPS-END
1057
1d144aa2
SV
1058Node-path: trunk
1059Node-kind: dir
1060Node-action: change
1061Prop-content-length: 75
1062Content-length: 75
1063
1064K 13
1065svn:mergeinfo
1066V 40
1067/branches/left:2-10
1068/branches/right:2-14
1069PROPS-END
1070
1071
1072Revision-number: 16
c79f1189
AM
1073Prop-content-length: 118
1074Content-length: 118
1d144aa2
SV
1075
1076K 7
1077svn:log
1078V 20
1079(r16) right update 3
1080K 10
1081svn:author
c79f1189
AM
1082V 3
1083adm
1d144aa2
SV
1084K 8
1085svn:date
1086V 27
c79f1189 10872010-01-19T04:14:27.049955Z
1d144aa2
SV
1088PROPS-END
1089
1090Node-path: branches/right/urkkk
1091Node-kind: file
1092Node-action: add
1093Prop-content-length: 10
1094Text-content-length: 6
1095Text-content-md5: 5889c8392e16251b0c80927607a03036
1096Text-content-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1097Content-length: 16
1098
1099PROPS-END
1100whamm
1101
1102
1103Revision-number: 17
c79f1189
AM
1104Prop-content-length: 118
1105Content-length: 118
1d144aa2
SV
1106
1107K 7
1108svn:log
1109V 20
1110(r17) trunk update 1
1111K 10
1112svn:author
c79f1189
AM
1113V 3
1114adm
1d144aa2
SV
1115K 8
1116svn:date
1117V 27
c79f1189 11182010-01-19T04:14:28.049615Z
1d144aa2
SV
1119PROPS-END
1120
1121Node-path: trunk/vronk
753dc384 1122Node-kind: file
1d144aa2
SV
1123Node-action: add
1124Prop-content-length: 10
1125Text-content-length: 4
1126Text-content-md5: b2f80fa02a7f1364b9c29d3da44bf9f9
1127Text-content-sha1: e994d980c0f2d7a3f76138bf96d57f36f9633828
1128Content-length: 14
1129
1130PROPS-END
1131pow
1132
1133
1134Revision-number: 18
c79f1189
AM
1135Prop-content-length: 134
1136Content-length: 134
1d144aa2
SV
1137
1138K 7
1139svn:log
1140V 36
1141(r18) Merge right to left sub-branch
1142K 10
1143svn:author
c79f1189
AM
1144V 3
1145adm
1d144aa2
SV
1146K 8
1147svn:date
1148V 27
c79f1189 11492010-01-19T04:14:31.061460Z
1d144aa2
SV
1150PROPS-END
1151
1152Node-path: branches/left-sub
1153Node-kind: dir
753dc384 1154Node-action: change
1d144aa2
SV
1155Prop-content-length: 55
1156Content-length: 55
1157
1158K 13
1159svn:mergeinfo
1160V 20
1161/branches/right:2-17
1162PROPS-END
1163
1164
1165Node-path: branches/left-sub/Makefile
1166Node-kind: file
1167Node-action: change
1168Text-content-length: 2713
1169Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
1170Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14
1171Content-length: 2713
753dc384
TA
1172
1173# -DCOLLISION_CHECK if you believe that SHA1's
1174# 1461501637330902918203684832716283019655932542976 hashes do not give you
1175# enough guarantees about no collisions between objects ever hapenning.
1176#
1177# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
1178# Note that you need some new glibc (at least >2.2.4) for this, and it will
1179# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
1180# break unless your underlying filesystem supports those sub-second times
1181# (my ext3 doesn't).
1182CFLAGS=-g -O3 -Wall
1183
1184CC=gcc
1185
1186
1187PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
1188 cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
1d144aa2 1189 check-files ls-tree merge-base merge-cache
753dc384
TA
1190
1191all: $(PROG)
1192
1193install: $(PROG)
1194 install $(PROG) $(HOME)/bin/
1195
1196LIBS= -lssl -lz
1197
1198init-db: init-db.o
1199
1200update-cache: update-cache.o read-cache.o
1201 $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
1202
1203show-diff: show-diff.o read-cache.o
1204 $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
1205
1206write-tree: write-tree.o read-cache.o
1207 $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
1208
1209read-tree: read-tree.o read-cache.o
1210 $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
1211
1212commit-tree: commit-tree.o read-cache.o
1213 $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
1214
1215cat-file: cat-file.o read-cache.o
1216 $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
1217
1218fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
1219 $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1220
1221checkout-cache: checkout-cache.o read-cache.o
1222 $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
1223
1224diff-tree: diff-tree.o read-cache.o
1225 $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
1226
1227rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
1228 $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1229
1230show-files: show-files.o read-cache.o
1231 $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
1232
1233check-files: check-files.o read-cache.o
1234 $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
1235
1236ls-tree: ls-tree.o read-cache.o
1237 $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
1238
1d144aa2
SV
1239merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
1240 $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1241
1242merge-cache: merge-cache.o read-cache.o
1243 $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
753dc384
TA
1244
1245read-cache.o: cache.h
1246show-diff.o: cache.h
1247
1248clean:
1249 rm -f *.o $(PROG)
1250
1251backup: clean
1252 cd .. ; tar czvf dircache.tar.gz dir-cache
1253
1254
1d144aa2
SV
1255Node-path: branches/left-sub/bang
1256Node-kind: file
1257Node-action: add
1258Node-copyfrom-rev: 17
1259Node-copyfrom-path: branches/right/bang
1260Text-copy-source-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
1261Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
1262
1263
1264Node-path: branches/left-sub/urkkk
1265Node-kind: file
1266Node-action: add
1267Node-copyfrom-rev: 17
1268Node-copyfrom-path: branches/right/urkkk
1269Text-copy-source-md5: 5889c8392e16251b0c80927607a03036
1270Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1271
1272
1273Revision-number: 19
c79f1189
AM
1274Prop-content-length: 128
1275Content-length: 128
753dc384
TA
1276
1277K 7
1278svn:log
1d144aa2
SV
1279V 30
1280(r19) left sub-branch update 2
753dc384
TA
1281K 10
1282svn:author
c79f1189
AM
1283V 3
1284adm
753dc384
TA
1285K 8
1286svn:date
1287V 27
c79f1189 12882010-01-19T04:14:32.049244Z
753dc384
TA
1289PROPS-END
1290
1d144aa2
SV
1291Node-path: branches/left-sub/wham_eth
1292Node-kind: file
1293Node-action: add
1294Prop-content-length: 10
1295Text-content-length: 6
1296Text-content-md5: 757bcd5818572ef3f9580052617c1c8b
1297Text-content-sha1: b165019b005c199237ba822c4404e771e93b654a
1298Content-length: 16
1299
1300PROPS-END
1301zowie
1302
1303
1304Revision-number: 20
c79f1189
AM
1305Prop-content-length: 117
1306Content-length: 117
1d144aa2
SV
1307
1308K 7
1309svn:log
1310V 19
1311(r20) left update 5
1312K 10
1313svn:author
c79f1189
AM
1314V 3
1315adm
1d144aa2
SV
1316K 8
1317svn:date
1318V 27
c79f1189 13192010-01-19T04:14:33.049332Z
1d144aa2
SV
1320PROPS-END
1321
1322Node-path: branches/left/glurpp
753dc384 1323Node-kind: file
1d144aa2
SV
1324Node-action: add
1325Prop-content-length: 10
1326Text-content-length: 8
1327Text-content-md5: 14a169f628e0bb59df9c2160649d0a30
1328Text-content-sha1: ef7d929e52177767ecfcd28941f6b7f04b4131e3
1329Content-length: 18
1330
1331PROPS-END
1332eee_yow
1333
1334
1335Revision-number: 21
c79f1189
AM
1336Prop-content-length: 146
1337Content-length: 146
1d144aa2
SV
1338
1339K 7
1340svn:log
1341V 48
1342(r21) Cherry-pick left sub-branch commit to left
1343K 10
1344svn:author
c79f1189
AM
1345V 3
1346adm
1d144aa2
SV
1347K 8
1348svn:date
1349V 27
c79f1189 13502010-01-19T04:14:36.041839Z
1d144aa2
SV
1351PROPS-END
1352
1353Node-path: branches/left
1354Node-kind: dir
753dc384 1355Node-action: change
1d144aa2
SV
1356Prop-content-length: 56
1357Content-length: 56
1358
1359K 13
1360svn:mergeinfo
1361V 21
1362/branches/left-sub:19
1363PROPS-END
1364
1365
1366Node-path: branches/left/wham_eth
1367Node-kind: file
1368Node-action: add
1369Node-copyfrom-rev: 19
1370Node-copyfrom-path: branches/left-sub/wham_eth
1371Text-copy-source-md5: 757bcd5818572ef3f9580052617c1c8b
1372Text-copy-source-sha1: b165019b005c199237ba822c4404e771e93b654a
1373
1374
1375Revision-number: 22
c79f1189
AM
1376Prop-content-length: 133
1377Content-length: 133
1d144aa2
SV
1378
1379K 7
1380svn:log
1381V 35
1382(r22) Merge left sub-branch to left
1383K 10
1384svn:author
c79f1189
AM
1385V 3
1386adm
1d144aa2
SV
1387K 8
1388svn:date
1389V 27
c79f1189 13902010-01-19T04:14:39.045014Z
1d144aa2
SV
1391PROPS-END
1392
1393Node-path: branches/left
1394Node-kind: dir
1395Node-action: change
1396Prop-content-length: 79
1397Content-length: 79
1398
1399K 13
1400svn:mergeinfo
1401V 44
1402/branches/left-sub:4-19
1403/branches/right:2-17
1404PROPS-END
1405
1406
1407Node-path: branches/left/Makefile
1408Node-kind: file
1409Node-action: change
1410Text-content-length: 2713
1411Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
1412Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14
1413Content-length: 2713
753dc384
TA
1414
1415# -DCOLLISION_CHECK if you believe that SHA1's
1416# 1461501637330902918203684832716283019655932542976 hashes do not give you
1417# enough guarantees about no collisions between objects ever hapenning.
1418#
1419# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
1420# Note that you need some new glibc (at least >2.2.4) for this, and it will
1421# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
1422# break unless your underlying filesystem supports those sub-second times
1423# (my ext3 doesn't).
1424CFLAGS=-g -O3 -Wall
1425
1426CC=gcc
1427
1428
1429PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
1430 cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
1d144aa2 1431 check-files ls-tree merge-base merge-cache
753dc384
TA
1432
1433all: $(PROG)
1434
1435install: $(PROG)
1436 install $(PROG) $(HOME)/bin/
1437
1438LIBS= -lssl -lz
1439
1440init-db: init-db.o
1441
1442update-cache: update-cache.o read-cache.o
1443 $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
1444
1445show-diff: show-diff.o read-cache.o
1446 $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
1447
1448write-tree: write-tree.o read-cache.o
1449 $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
1450
1451read-tree: read-tree.o read-cache.o
1452 $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
1453
1454commit-tree: commit-tree.o read-cache.o
1455 $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
1456
1457cat-file: cat-file.o read-cache.o
1458 $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
1459
1460fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
1461 $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1462
1463checkout-cache: checkout-cache.o read-cache.o
1464 $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
1465
1466diff-tree: diff-tree.o read-cache.o
1467 $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
1468
1469rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
1470 $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1471
1472show-files: show-files.o read-cache.o
1473 $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
1474
1475check-files: check-files.o read-cache.o
1476 $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
1477
1478ls-tree: ls-tree.o read-cache.o
1479 $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
1480
1481merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
1482 $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1483
1d144aa2
SV
1484merge-cache: merge-cache.o read-cache.o
1485 $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
1486
753dc384
TA
1487read-cache.o: cache.h
1488show-diff.o: cache.h
1489
1490clean:
1491 rm -f *.o $(PROG)
1492
1493backup: clean
1494 cd .. ; tar czvf dircache.tar.gz dir-cache
1495
1496
1d144aa2
SV
1497Node-path: branches/left/README
1498Node-kind: file
1499Node-action: add
1500Node-copyfrom-rev: 18
1501Node-copyfrom-path: branches/left-sub/README
1502Text-copy-source-md5: fdbcfb6be9afe1121862143f226b51cf
1503Text-copy-source-sha1: 1d1f5ea4ceb584337ffe59b8980d92e3b78dfef4
1504
1505
1506Node-path: branches/left/bang
1507Node-kind: file
1508Node-action: add
1509Node-copyfrom-rev: 18
1510Node-copyfrom-path: branches/left-sub/bang
1511Text-copy-source-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
1512Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
1513
1514
1515Node-path: branches/left/urkkk
1516Node-kind: file
1517Node-action: add
1518Node-copyfrom-rev: 18
1519Node-copyfrom-path: branches/left-sub/urkkk
1520Text-copy-source-md5: 5889c8392e16251b0c80927607a03036
1521Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1522
1523
1524Revision-number: 23
c79f1189
AM
1525Prop-content-length: 125
1526Content-length: 125
753dc384
TA
1527
1528K 7
1529svn:log
1d144aa2
SV
1530V 27
1531(r23) Merge left to trunk 2
753dc384
TA
1532K 10
1533svn:author
c79f1189
AM
1534V 3
1535adm
753dc384
TA
1536K 8
1537svn:date
1538V 27
c79f1189 15392010-01-19T04:14:42.052798Z
753dc384
TA
1540PROPS-END
1541
1542Node-path: trunk
1543Node-kind: dir
1544Node-action: change
1d144aa2
SV
1545Prop-content-length: 99
1546Content-length: 99
753dc384
TA
1547
1548K 13
1549svn:mergeinfo
1d144aa2
SV
1550V 64
1551/branches/left:2-22
1552/branches/left-sub:4-19
1553/branches/right:2-17
1554PROPS-END
1555
1556
1557Node-path: trunk/README
1558Node-kind: file
1559Node-action: add
1560Node-copyfrom-rev: 22
1561Node-copyfrom-path: branches/left/README
1562Text-copy-source-md5: fdbcfb6be9afe1121862143f226b51cf
1563Text-copy-source-sha1: 1d1f5ea4ceb584337ffe59b8980d92e3b78dfef4
1564
1565
1566Node-path: trunk/glurpp
1567Node-kind: file
1568Node-action: add
1569Node-copyfrom-rev: 22
1570Node-copyfrom-path: branches/left/glurpp
1571Text-copy-source-md5: 14a169f628e0bb59df9c2160649d0a30
1572Text-copy-source-sha1: ef7d929e52177767ecfcd28941f6b7f04b4131e3
1573
1574
1575Node-path: trunk/urkkk
1576Node-kind: file
1577Node-action: add
1578Node-copyfrom-rev: 22
1579Node-copyfrom-path: branches/left/urkkk
1580Text-copy-source-md5: 5889c8392e16251b0c80927607a03036
1581Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1582
1583
1584Node-path: trunk/wham_eth
1585Node-kind: file
1586Node-action: add
1587Node-copyfrom-rev: 22
1588Node-copyfrom-path: branches/left/wham_eth
1589Text-copy-source-md5: 757bcd5818572ef3f9580052617c1c8b
1590Text-copy-source-sha1: b165019b005c199237ba822c4404e771e93b654a
1591
1592
1593Node-path: trunk/zlonk
1594Node-kind: file
1595Node-action: add
1596Node-copyfrom-rev: 22
1597Node-copyfrom-path: branches/left/zlonk
1598Text-copy-source-md5: 8b9d8c7c2aaa6167e7d3407a773bbbba
1599Text-copy-source-sha1: 9716527ebd70a75c27625cacbeb2d897c6e86178
1600
1601
1602Revision-number: 24
c79f1189
AM
1603Prop-content-length: 130
1604Content-length: 130
1d144aa2
SV
1605
1606K 7
1607svn:log
1608V 32
1609(r24) non-merge right to trunk 2
1610K 10
1611svn:author
c79f1189
AM
1612V 3
1613adm
1d144aa2
SV
1614K 8
1615svn:date
1616V 27
c79f1189 16172010-01-19T04:14:44.038434Z
1d144aa2
SV
1618PROPS-END
1619
1620Node-path: trunk
1621Node-kind: dir
1622Node-action: change
1623Prop-content-length: 99
1624Content-length: 99
1625
1626K 13
1627svn:mergeinfo
1628V 64
1629/branches/left:2-22
1630/branches/left-sub:4-19
1631/branches/right:2-22
753dc384
TA
1632PROPS-END
1633
1634
c79f1189 1635Revision-number: 25
9560808f
TS
1636Prop-content-length: 129
1637Content-length: 129
1638
1639K 7
1640svn:log
1641V 31
1642(r25) make b1 branch from trunk
1643K 10
1644svn:author
1645V 3
1646adm
1647K 8
1648svn:date
1649V 27
16502010-02-22T06:18:56.084589Z
1651PROPS-END
1652
1653Node-path: branches/b1
1654Node-kind: dir
1655Node-action: add
1656Node-copyfrom-rev: 24
1657Node-copyfrom-path: trunk
1658
1659
1660Revision-number: 26
1661Prop-content-length: 129
1662Content-length: 129
1663
1664K 7
1665svn:log
1666V 31
1667(r26) make b2 branch from trunk
1668K 10
1669svn:author
1670V 3
1671adm
1672K 8
1673svn:date
1674V 27
16752010-02-22T06:18:59.076940Z
1676PROPS-END
1677
1678Node-path: branches/b2
1679Node-kind: dir
1680Node-action: add
1681Node-copyfrom-rev: 25
1682Node-copyfrom-path: trunk
1683
1684
1685Revision-number: 27
1686Prop-content-length: 115
1687Content-length: 115
1688
1689K 7
1690svn:log
1691V 17
1692(r27) b2 update 1
1693K 10
1694svn:author
1695V 3
1696adm
1697K 8
1698svn:date
1699V 27
17002010-02-22T06:19:01.095762Z
1701PROPS-END
1702
1703Node-path: branches/b2/b2file
1704Node-kind: file
1705Node-action: add
1706Prop-content-length: 10
1707Text-content-length: 3
1708Text-content-md5: 5edbdd57cba621eb3c6e601bf563b4dc
1709Text-content-sha1: 9d4b38049776bd0a2074d67cad23f8eaed35a3b3
1710Content-length: 13
1711
1712PROPS-END
1713b2
1714
1715
1716Revision-number: 28
1717Prop-content-length: 115
1718Content-length: 115
1719
1720K 7
1721svn:log
1722V 17
1723(r28) b1 update 1
1724K 10
1725svn:author
1726V 3
1727adm
1728K 8
1729svn:date
1730V 27
17312010-02-22T06:19:03.097465Z
1732PROPS-END
1733
1734Node-path: branches/b1/b1file
1735Node-kind: file
1736Node-action: add
1737Prop-content-length: 10
1738Text-content-length: 3
1739Text-content-md5: 08778dfd9ac4f603231896aba7aad523
1740Text-content-sha1: b551771aa4ad5b14123fc3bd98d89db2bc0edd4f
1741Content-length: 13
1742
1743PROPS-END
1744b1
1745
1746
1747Revision-number: 29
1748Prop-content-length: 121
1749Content-length: 121
1750
1751K 7
1752svn:log
1753V 23
1754(r29) Merge b1 to trunk
1755K 10
1756svn:author
1757V 3
1758adm
1759K 8
1760svn:date
1761V 27
17622010-02-22T06:19:06.073175Z
1763PROPS-END
1764
1765Node-path: trunk
1766Node-kind: dir
1767Node-action: change
1768Prop-content-length: 118
1769Content-length: 118
1770
1771K 13
1772svn:mergeinfo
1773V 83
1774/branches/b1:25-28
1775/branches/left:2-22
1776/branches/left-sub:4-19
1777/branches/right:2-22
1778PROPS-END
1779
1780
1781Node-path: trunk/b1file
1782Node-kind: file
1783Node-action: add
1784Node-copyfrom-rev: 28
1785Node-copyfrom-path: branches/b1/b1file
1786Text-copy-source-md5: 08778dfd9ac4f603231896aba7aad523
1787Text-copy-source-sha1: b551771aa4ad5b14123fc3bd98d89db2bc0edd4f
1788
1789
1790Revision-number: 30
1791Prop-content-length: 143
1792Content-length: 143
1793
1794K 7
1795svn:log
1796V 45
1797(r30) trunk commit before merging trunk to b2
1798K 10
1799svn:author
1800V 3
1801adm
1802K 8
1803svn:date
1804V 27
18052010-02-22T06:19:08.096353Z
1806PROPS-END
1807
1808Node-path: trunk/trunkfile
1809Node-kind: file
1810Node-action: add
1811Prop-content-length: 10
1812Text-content-length: 6
1813Text-content-md5: edf45fe5c98c5367733b39bbb2bb20d9
1814Text-content-sha1: 7361d1685e5c86dfc523620cfaf598f196f86239
1815Content-length: 16
1816
1817PROPS-END
1818trunk
1819
1820
1821Revision-number: 31
1822Prop-content-length: 121
1823Content-length: 121
1824
1825K 7
1826svn:log
1827V 23
1828(r31) Merge trunk to b2
1829K 10
1830svn:author
1831V 3
1832adm
1833K 8
1834svn:date
1835V 27
18362010-02-22T06:19:11.081541Z
1837PROPS-END
1838
1839Node-path: branches/b2
1840Node-kind: dir
1841Node-action: change
1842Prop-content-length: 131
1843Content-length: 131
1844
1845K 13
1846svn:mergeinfo
1847V 96
1848/branches/b1:25-28
1849/branches/left:2-22
1850/branches/left-sub:4-19
1851/branches/right:2-22
1852/trunk:26-30
1853PROPS-END
1854
1855
1856Node-path: branches/b2/b1file
1857Node-kind: file
1858Node-action: add
1859Node-copyfrom-rev: 30
1860Node-copyfrom-path: trunk/b1file
1861Text-copy-source-md5: 08778dfd9ac4f603231896aba7aad523
1862Text-copy-source-sha1: b551771aa4ad5b14123fc3bd98d89db2bc0edd4f
1863
1864
1865Node-path: branches/b2/trunkfile
1866Node-kind: file
1867Node-action: add
1868Node-copyfrom-rev: 30
1869Node-copyfrom-path: trunk/trunkfile
1870Text-copy-source-md5: edf45fe5c98c5367733b39bbb2bb20d9
1871Text-copy-source-sha1: 7361d1685e5c86dfc523620cfaf598f196f86239
1872
1873
1874Revision-number: 32
1875Prop-content-length: 121
1876Content-length: 121
1877
1878K 7
1879svn:log
1880V 23
1881(r32) Merge b2 to trunk
1882K 10
1883svn:author
1884V 3
1885adm
1886K 8
1887svn:date
1888V 27
18892010-02-22T06:19:14.117939Z
1890PROPS-END
1891
1892Node-path: trunk
1893Node-kind: dir
1894Node-action: change
1895Prop-content-length: 138
1896Content-length: 138
1897
1898K 13
1899svn:mergeinfo
1900V 102
1901/branches/b1:25-28
1902/branches/b2:26-31
1903/branches/left:2-22
1904/branches/left-sub:4-19
1905/branches/right:2-22
1906PROPS-END
1907
1908
1909Node-path: trunk/b2file
1910Node-kind: file
1911Node-action: add
1912Node-copyfrom-rev: 31
1913Node-copyfrom-path: branches/b2/b2file
1914Text-copy-source-md5: 5edbdd57cba621eb3c6e601bf563b4dc
1915Text-copy-source-sha1: 9d4b38049776bd0a2074d67cad23f8eaed35a3b3
1916
1917
1918Revision-number: 33
1919Prop-content-length: 145
1920Content-length: 145
1921
1922K 7
1923svn:log
1924V 47
1925(r33) make f1 branch from trunk with a new file
1926K 10
1927svn:author
1928V 3
1929adm
1930K 8
1931svn:date
1932V 27
19332010-02-22T06:19:17.105832Z
1934PROPS-END
1935
1936Node-path: branches/f1
1937Node-kind: dir
1938Node-action: add
1939Node-copyfrom-rev: 32
1940Node-copyfrom-path: trunk
1941
1942
1943Node-path: branches/f1/f1file
1944Node-kind: file
1945Node-action: add
1946Prop-content-length: 10
1947Text-content-length: 3
1948Text-content-md5: 2b1abc6b6c5c0018851f9f8e6475563b
1949Text-content-sha1: aece6dfba588900e00d95601d22b4408d49580af
1950Content-length: 13
1951
1952PROPS-END
1953f1
1954
1955
1956Revision-number: 34
1957Prop-content-length: 145
1958Content-length: 145
1959
1960K 7
1961svn:log
1962V 47
1963(r34) make f2 branch from trunk with a new file
1964K 10
1965svn:author
1966V 3
1967adm
1968K 8
1969svn:date
1970V 27
19712010-02-22T06:19:20.110057Z
1972PROPS-END
1973
1974Node-path: branches/f2
1975Node-kind: dir
1976Node-action: add
1977Node-copyfrom-rev: 33
1978Node-copyfrom-path: trunk
1979
1980
1981Node-path: branches/f2/f2file
1982Node-kind: file
1983Node-action: add
1984Prop-content-length: 10
1985Text-content-length: 3
1986Text-content-md5: 575c5638d60271457e54ab7d07309502
1987Text-content-sha1: 1c49a440c352f3473efa9512255033b94dc7def0
1988Content-length: 13
1989
1990PROPS-END
1991f2
1992
1993
1994Revision-number: 35
1995Prop-content-length: 128
1996Content-length: 128
1997
1998K 7
1999svn:log
2000V 30
2001(r35) Merge f1 and f2 to trunk
2002K 10
2003svn:author
2004V 3
2005adm
2006K 8
2007svn:date
2008V 27
20092010-02-22T06:19:24.081490Z
2010PROPS-END
2011
2012Node-path: trunk
2013Node-kind: dir
2014Node-action: change
2015Prop-content-length: 173
2016Content-length: 173
2017
2018K 13
2019svn:mergeinfo
2020V 137
2021/branches/b1:25-28
2022/branches/b2:26-31
2023/branches/f1:33-34
2024/branches/f2:34
2025/branches/left:2-22
2026/branches/left-sub:4-19
2027/branches/right:2-22
2028PROPS-END
2029
2030
2031Node-path: trunk/f1file
2032Node-kind: file
2033Node-action: add
2034Node-copyfrom-rev: 34
2035Node-copyfrom-path: branches/f1/f1file
2036Text-copy-source-md5: 2b1abc6b6c5c0018851f9f8e6475563b
2037Text-copy-source-sha1: aece6dfba588900e00d95601d22b4408d49580af
2038
2039
2040Node-path: trunk/f2file
2041Node-kind: file
2042Node-action: add
2043Node-copyfrom-rev: 34
2044Node-copyfrom-path: branches/f2/f2file
2045Text-copy-source-md5: 575c5638d60271457e54ab7d07309502
2046Text-copy-source-sha1: 1c49a440c352f3473efa9512255033b94dc7def0
2047
2048
2049Revision-number: 36
c79f1189
AM
2050Prop-content-length: 135
2051Content-length: 135
2052
2053K 7
2054svn:log
2055V 37
9560808f 2056(r36) add subdirectory to left branch
c79f1189
AM
2057K 10
2058svn:author
2059V 3
2060adm
2061K 8
2062svn:date
2063V 27
9560808f 20642010-02-22T06:19:26.113516Z
c79f1189
AM
2065PROPS-END
2066
2067Node-path: branches/left/subdir
2068Node-kind: dir
2069Node-action: add
2070Prop-content-length: 10
2071Content-length: 10
2072
2073PROPS-END
2074
2075
2076Node-path: branches/left/subdir/cowboy
2077Node-kind: file
2078Node-action: add
2079Prop-content-length: 10
2080Text-content-length: 7
2081Text-content-md5: f1d6530278ad409e68cc675476ad995f
2082Text-content-sha1: 732d9e3e5c391ffd767a98b45ddcc848de778cea
2083Content-length: 17
2084
2085PROPS-END
2086Yeehaw
2087
2088
9560808f 2089Revision-number: 37
c79f1189
AM
2090Prop-content-length: 123
2091Content-length: 123
2092
2093K 7
2094svn:log
2095V 25
9560808f 2096(r37) merge left to trunk
c79f1189
AM
2097K 10
2098svn:author
2099V 3
2100adm
2101K 8
2102svn:date
2103V 27
9560808f 21042010-02-22T06:19:29.073699Z
c79f1189
AM
2105PROPS-END
2106
2107Node-path: trunk
2108Node-kind: dir
2109Node-action: change
9560808f
TS
2110Prop-content-length: 173
2111Content-length: 173
c79f1189
AM
2112
2113K 13
2114svn:mergeinfo
9560808f
TS
2115V 137
2116/branches/b1:25-28
2117/branches/b2:26-31
2118/branches/f1:33-34
2119/branches/f2:34
2120/branches/left:2-36
c79f1189
AM
2121/branches/left-sub:4-19
2122/branches/right:2-22
2123PROPS-END
2124
2125
2126Node-path: trunk/subdir
2127Node-kind: dir
2128Node-action: add
9560808f 2129Node-copyfrom-rev: 36
c79f1189
AM
2130Node-copyfrom-path: branches/left/subdir
2131
2132
9560808f 2133Revision-number: 38
ae5b370c
TS
2134Prop-content-length: 123
2135Content-length: 123
c79f1189
AM
2136
2137K 7
2138svn:log
ae5b370c 2139V 25
9560808f 2140(r38) make partial branch
c79f1189
AM
2141K 10
2142svn:author
2143V 3
2144adm
2145K 8
2146svn:date
2147V 27
9560808f 21482010-02-22T06:19:32.072243Z
c79f1189
AM
2149PROPS-END
2150
2151Node-path: branches/partial
2152Node-kind: dir
2153Node-action: add
9560808f 2154Node-copyfrom-rev: 37
c79f1189
AM
2155Node-copyfrom-path: trunk/subdir
2156
2157
9560808f 2158Revision-number: 39
ae5b370c
TS
2159Prop-content-length: 118
2160Content-length: 118
2161
2162K 7
2163svn:log
2164V 20
9560808f 2165(r39) partial update
ae5b370c
TS
2166K 10
2167svn:author
2168V 3
2169adm
2170K 8
2171svn:date
2172V 27
9560808f 21732010-02-22T06:19:34.097961Z
ae5b370c
TS
2174PROPS-END
2175
c79f1189
AM
2176Node-path: branches/partial/palindromes
2177Node-kind: file
2178Node-action: add
2179Prop-content-length: 10
2180Text-content-length: 8
2181Text-content-md5: 5d1c2024fb5efc4eef812856df1b080c
2182Text-content-sha1: 5f8509ddd14c91a52864dd1447344e706f9bbc69
2183Content-length: 18
2184
2185PROPS-END
2186racecar
2187
2188
9560808f 2189Revision-number: 40
c79f1189
AM
2190Prop-content-length: 126
2191Content-length: 126
2192
2193K 7
2194svn:log
2195V 28
9560808f 2196(r40) merge partial to trunk
c79f1189
AM
2197K 10
2198svn:author
2199V 3
2200adm
2201K 8
2202svn:date
2203V 27
9560808f 22042010-02-22T06:19:37.080211Z
c79f1189
AM
2205PROPS-END
2206
2207Node-path: trunk/subdir
2208Node-kind: dir
2209Node-action: change
9560808f
TS
2210Prop-content-length: 246
2211Content-length: 246
c79f1189
AM
2212
2213K 13
2214svn:mergeinfo
9560808f
TS
2215V 210
2216/branches/b1/subdir:25-28
2217/branches/b2/subdir:26-31
2218/branches/f1/subdir:33-34
2219/branches/f2/subdir:34
2220/branches/left/subdir:2-36
c79f1189 2221/branches/left-sub/subdir:4-19
9560808f 2222/branches/partial:38-39
c79f1189
AM
2223/branches/right/subdir:2-22
2224PROPS-END
2225
2226
2227Node-path: trunk/subdir/palindromes
2228Node-kind: file
2229Node-action: add
9560808f 2230Node-copyfrom-rev: 39
c79f1189
AM
2231Node-copyfrom-path: branches/partial/palindromes
2232Text-copy-source-md5: 5d1c2024fb5efc4eef812856df1b080c
2233Text-copy-source-sha1: 5f8509ddd14c91a52864dd1447344e706f9bbc69
2234
2235
9560808f 2236Revision-number: 41
ae5b370c
TS
2237Prop-content-length: 116
2238Content-length: 116
c79f1189
AM
2239
2240K 7
2241svn:log
ae5b370c 2242V 18
9560808f 2243(r41) tagging v1.0
c79f1189
AM
2244K 10
2245svn:author
2246V 3
2247adm
2248K 8
2249svn:date
2250V 27
9560808f 22512010-02-22T06:19:40.083460Z
c79f1189
AM
2252PROPS-END
2253
2254Node-path: tags/v1.0
2255Node-kind: dir
2256Node-action: add
9560808f 2257Node-copyfrom-rev: 40
c79f1189
AM
2258Node-copyfrom-path: trunk
2259
2260
9560808f 2261Revision-number: 42
ae5b370c
TS
2262Prop-content-length: 131
2263Content-length: 131
c79f1189
AM
2264
2265K 7
2266svn:log
ae5b370c 2267V 33
9560808f 2268(r42) make bugfix branch from tag
c79f1189
AM
2269K 10
2270svn:author
2271V 3
2272adm
2273K 8
2274svn:date
2275V 27
9560808f 22762010-02-22T06:19:43.118075Z
c79f1189
AM
2277PROPS-END
2278
2279Node-path: branches/bugfix
2280Node-kind: dir
2281Node-action: add
9560808f 2282Node-copyfrom-rev: 41
c79f1189
AM
2283Node-copyfrom-path: tags/v1.0
2284
2285
9560808f 2286Revision-number: 43
ae5b370c
TS
2287Prop-content-length: 120
2288Content-length: 120
2289
2290K 7
2291svn:log
2292V 22
9560808f 2293(r43) commit to bugfix
ae5b370c
TS
2294K 10
2295svn:author
2296V 3
2297adm
2298K 8
2299svn:date
2300V 27
9560808f 23012010-02-22T06:19:45.079536Z
ae5b370c
TS
2302PROPS-END
2303
c79f1189
AM
2304Node-path: branches/bugfix/subdir/palindromes
2305Node-kind: file
2306Node-action: change
2307Text-content-length: 14
2308Text-content-md5: 3b12d98578a3f4320ba97e66da54fe5f
2309Text-content-sha1: 672931c9e8ac2c408209efab2f015638b6d64042
2310Content-length: 14
2311
2312racecar
2313kayak
2314
2315
9560808f 2316Revision-number: 44
c79f1189
AM
2317Prop-content-length: 125
2318Content-length: 125
2319
2320K 7
2321svn:log
2322V 27
9560808f 2323(r44) Merge BUGFIX to TRUNK
c79f1189
AM
2324K 10
2325svn:author
2326V 3
2327adm
2328K 8
2329svn:date
2330V 27
9560808f 23312010-02-22T06:19:48.078914Z
c79f1189
AM
2332PROPS-END
2333
2334Node-path: trunk
2335Node-kind: dir
2336Node-action: change
9560808f
TS
2337Prop-content-length: 210
2338Content-length: 210
c79f1189
AM
2339
2340K 13
2341svn:mergeinfo
9560808f
TS
2342V 174
2343/branches/b1:25-28
2344/branches/b2:26-31
2345/branches/bugfix:42-43
2346/branches/f1:33-34
2347/branches/f2:34
2348/branches/left:2-36
c79f1189
AM
2349/branches/left-sub:4-19
2350/branches/right:2-22
9560808f 2351/tags/v1.0:41
c79f1189
AM
2352PROPS-END
2353
2354
2355Node-path: trunk/subdir
2356Node-kind: dir
2357Node-action: change
9560808f
TS
2358Prop-content-length: 297
2359Content-length: 297
c79f1189
AM
2360
2361K 13
2362svn:mergeinfo
9560808f
TS
2363V 261
2364/branches/b1/subdir:25-28
2365/branches/b2/subdir:26-31
2366/branches/bugfix/subdir:42-43
2367/branches/f1/subdir:33-34
2368/branches/f2/subdir:34
2369/branches/left/subdir:2-36
c79f1189 2370/branches/left-sub/subdir:4-19
9560808f 2371/branches/partial:38-39
c79f1189 2372/branches/right/subdir:2-22
9560808f 2373/tags/v1.0/subdir:41
c79f1189
AM
2374PROPS-END
2375
2376
2377Node-path: trunk/subdir/palindromes
2378Node-kind: file
2379Node-action: change
2380Text-content-length: 14
2381Text-content-md5: 3b12d98578a3f4320ba97e66da54fe5f
2382Text-content-sha1: 672931c9e8ac2c408209efab2f015638b6d64042
2383Content-length: 14
2384
2385racecar
2386kayak
2387
2388