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

git-svn: add test data for SVN 1.5+ merge, with script.

Dump generated with SVN 1.5.1 (on lenny amd64). This test should hopefully cover all but a few intermediate versions of the svnmerge.py script. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Acked-by: Eric Wong <normalperson@yhbt.net>

Sam Vilain committed Oct 20, 2009 at 15:42 UTC ce62683096d144749c77e557ecd21c91b840b0f1
3 files changed +811
t/t9151/.gitignore new
+2
@@ -0,0 +1,2 @@
1 +foo
2 +foo.svn
t/t9151/make-svnmerge-dump new
+73
@@ -0,0 +1,73 @@
1 +#!/bin/sh
2 +#
3 +# this script sets up a Subversion repository for Makefile in the
4 +# first ever git merge, as if it were done with svnmerge (SVN 1.5+)
5 +#
6 +
7 +rm -rf foo.svn foo
8 +set -e
9 +
10 +mkdir foo.svn
11 +svnadmin create foo.svn
12 +svn co file://`pwd`/foo.svn foo
13 +
14 +cd foo
15 +mkdir trunk
16 +mkdir branches
17 +svn add trunk branches
18 +svn commit -m "Setup trunk and branches"
19 +cd trunk
20 +
21 +git cat-file blob 6683463e:Makefile > Makefile
22 +svn add Makefile
23 +
24 +echo "Committing ANCESTOR"
25 +svn commit -m "ancestor"
26 +cd ..
27 +svn cp trunk branches/left
28 +
29 +echo "Committing BRANCH POINT"
30 +svn commit -m "make left branch"
31 +cd branches/left/
32 +
33 +#$sm init
34 +#svn commit -m "init svnmerge"
35 +
36 +git cat-file blob 5873b67e:Makefile > Makefile
37 +echo "Committing BRANCH UPDATE 1"
38 +svn commit -m "left update 1"
39 +cd ../..
40 +
41 +cd trunk
42 +git cat-file blob 75118b13:Makefile > Makefile
43 +echo "Committing TRUNK UPDATE"
44 +svn commit -m "trunk update"
45 +
46 +cd ../branches/left
47 +git cat-file blob ff5ebe39:Makefile > Makefile
48 +echo "Committing BRANCH UPDATE 2"
49 +svn commit -m "left update 2"
50 +
51 +git cat-file blob b5039db6:Makefile > Makefile
52 +echo "Committing BRANCH UPDATE 3"
53 +svn commit -m "left update 3"
54 +
55 +# merge to trunk
56 +
57 +cd ../..
58 +svn update
59 +cd trunk
60 +
61 +svn merge ../branches/left --accept postpone
62 +
63 +git cat-file blob b51ad431:Makefile > Makefile
64 +
65 +svn resolved Makefile
66 +
67 +svn commit -m "Merge trunk"
68 +
69 +cd ../..
70 +
71 +svnadmin dump foo.svn > svn-mergeinfo.dump
72 +
73 +rm -rf foo foo.svn
t/t9151/svn-mergeinfo.dump new
+736
@@ -0,0 +1,736 @@
1 +SVN-fs-dump-format-version: 2
2 +
3 +UUID: 1ce241d1-ba54-4eb9-bded-03057fe48a33
4 +
5 +Revision-number: 0
6 +Prop-content-length: 56
7 +Content-length: 56
8 +
9 +K 8
10 +svn:date
11 +V 27
12 +2009-10-20T01:33:37.692723Z
13 +PROPS-END
14 +
15 +Revision-number: 1
16 +Prop-content-length: 123
17 +Content-length: 123
18 +
19 +K 7
20 +svn:log
21 +V 24
22 +Setup trunk and branches
23 +K 10
24 +svn:author
25 +V 4
26 +samv
27 +K 8
28 +svn:date
29 +V 27
30 +2009-10-20T01:33:38.159933Z
31 +PROPS-END
32 +
33 +Node-path: branches
34 +Node-kind: dir
35 +Node-action: add
36 +Prop-content-length: 10
37 +Content-length: 10
38 +
39 +PROPS-END
40 +
41 +
42 +Node-path: trunk
43 +Node-kind: dir
44 +Node-action: add
45 +Prop-content-length: 10
46 +Content-length: 10
47 +
48 +PROPS-END
49 +
50 +
51 +Revision-number: 2
52 +Prop-content-length: 106
53 +Content-length: 106
54 +
55 +K 7
56 +svn:log
57 +V 8
58 +ancestor
59 +K 10
60 +svn:author
61 +V 4
62 +samv
63 +K 8
64 +svn:date
65 +V 27
66 +2009-10-20T01:33:39.160059Z
67 +PROPS-END
68 +
69 +Node-path: trunk/Makefile
70 +Node-kind: file
71 +Node-action: add
72 +Prop-content-length: 10
73 +Text-content-length: 2401
74 +Text-content-md5: bfd8ff778d1492dc6758567373176a89
75 +Content-length: 2411
76 +
77 +PROPS-END
78 +# -DCOLLISION_CHECK if you believe that SHA1's
79 +# 1461501637330902918203684832716283019655932542976 hashes do not give you
80 +# enough guarantees about no collisions between objects ever hapenning.
81 +#
82 +# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
83 +# Note that you need some new glibc (at least >2.2.4) for this, and it will
84 +# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
85 +# break unless your underlying filesystem supports those sub-second times
86 +# (my ext3 doesn't).
87 +CFLAGS=-g -O3 -Wall
88 +
89 +CC=gcc
90 +
91 +
92 +PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
93 + cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
94 + check-files ls-tree merge-base
95 +
96 +all: $(PROG)
97 +
98 +install: $(PROG)
99 + install $(PROG) $(HOME)/bin/
100 +
101 +LIBS= -lssl -lz
102 +
103 +init-db: init-db.o
104 +
105 +update-cache: update-cache.o read-cache.o
106 + $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
107 +
108 +show-diff: show-diff.o read-cache.o
109 + $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
110 +
111 +write-tree: write-tree.o read-cache.o
112 + $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
113 +
114 +read-tree: read-tree.o read-cache.o
115 + $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
116 +
117 +commit-tree: commit-tree.o read-cache.o
118 + $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
119 +
120 +cat-file: cat-file.o read-cache.o
121 + $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
122 +
123 +fsck-cache: fsck-cache.o read-cache.o
124 + $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
125 +
126 +checkout-cache: checkout-cache.o read-cache.o
127 + $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
128 +
129 +diff-tree: diff-tree.o read-cache.o
130 + $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
131 +
132 +rev-tree: rev-tree.o read-cache.o
133 + $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
134 +
135 +show-files: show-files.o read-cache.o
136 + $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
137 +
138 +check-files: check-files.o read-cache.o
139 + $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
140 +
141 +ls-tree: ls-tree.o read-cache.o
142 + $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
143 +
144 +merge-base: merge-base.o read-cache.o
145 + $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
146 +
147 +read-cache.o: cache.h
148 +show-diff.o: cache.h
149 +
150 +clean:
151 + rm -f *.o $(PROG)
152 +
153 +backup: clean
154 + cd .. ; tar czvf dircache.tar.gz dir-cache
155 +
156 +
157 +Revision-number: 3
158 +Prop-content-length: 115
159 +Content-length: 115
160 +
161 +K 7
162 +svn:log
163 +V 16
164 +make left branch
165 +K 10
166 +svn:author
167 +V 4
168 +samv
169 +K 8
170 +svn:date
171 +V 27
172 +2009-10-20T01:33:41.148192Z
173 +PROPS-END
174 +
175 +Node-path: branches/left
176 +Node-kind: dir
177 +Node-action: add
178 +Node-copyfrom-rev: 1
179 +Node-copyfrom-path: trunk
180 +Prop-content-length: 34
181 +Content-length: 34
182 +
183 +K 13
184 +svn:mergeinfo
185 +V 0
186 +
187 +PROPS-END
188 +
189 +
190 +Node-path: branches/left/Makefile
191 +Node-kind: file
192 +Node-action: add
193 +Node-copyfrom-rev: 2
194 +Node-copyfrom-path: trunk/Makefile
195 +Text-copy-source-md5: bfd8ff778d1492dc6758567373176a89
196 +
197 +
198 +Revision-number: 4
199 +Prop-content-length: 112
200 +Content-length: 112
201 +
202 +K 7
203 +svn:log
204 +V 13
205 +left update 1
206 +K 10
207 +svn:author
208 +V 4
209 +samv
210 +K 8
211 +svn:date
212 +V 27
213 +2009-10-20T01:33:42.148773Z
214 +PROPS-END
215 +
216 +Node-path: branches/left/Makefile
217 +Node-kind: file
218 +Node-action: change
219 +Text-content-length: 2465
220 +Text-content-md5: 16e38d9753b061731650561ce01b1195
221 +Content-length: 2465
222 +
223 +# -DCOLLISION_CHECK if you believe that SHA1's
224 +# 1461501637330902918203684832716283019655932542976 hashes do not give you
225 +# enough guarantees about no collisions between objects ever hapenning.
226 +#
227 +# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
228 +# Note that you need some new glibc (at least >2.2.4) for this, and it will
229 +# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
230 +# break unless your underlying filesystem supports those sub-second times
231 +# (my ext3 doesn't).
232 +CFLAGS=-g -O3 -Wall
233 +
234 +CC=gcc
235 +
236 +
237 +PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
238 + cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
239 + check-files ls-tree merge-base
240 +
241 +all: $(PROG)
242 +
243 +install: $(PROG)
244 + install $(PROG) $(HOME)/bin/
245 +
246 +LIBS= -lssl -lz
247 +
248 +init-db: init-db.o
249 +
250 +update-cache: update-cache.o read-cache.o
251 + $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
252 +
253 +show-diff: show-diff.o read-cache.o
254 + $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
255 +
256 +write-tree: write-tree.o read-cache.o
257 + $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
258 +
259 +read-tree: read-tree.o read-cache.o
260 + $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
261 +
262 +commit-tree: commit-tree.o read-cache.o
263 + $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
264 +
265 +cat-file: cat-file.o read-cache.o
266 + $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
267 +
268 +fsck-cache: fsck-cache.o read-cache.o
269 + $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
270 +
271 +checkout-cache: checkout-cache.o read-cache.o
272 + $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
273 +
274 +diff-tree: diff-tree.o read-cache.o
275 + $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
276 +
277 +rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
278 + $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
279 +
280 +show-files: show-files.o read-cache.o
281 + $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
282 +
283 +check-files: check-files.o read-cache.o
284 + $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
285 +
286 +ls-tree: ls-tree.o read-cache.o
287 + $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
288 +
289 +merge-base: merge-base.o read-cache.o
290 + $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
291 +
292 +read-cache.o: cache.h
293 +show-diff.o: cache.h
294 +
295 +clean:
296 + rm -f *.o $(PROG)
297 +
298 +backup: clean
299 + cd .. ; tar czvf dircache.tar.gz dir-cache
300 +
301 +
302 +Revision-number: 5
303 +Prop-content-length: 111
304 +Content-length: 111
305 +
306 +K 7
307 +svn:log
308 +V 12
309 +trunk update
310 +K 10
311 +svn:author
312 +V 4
313 +samv
314 +K 8
315 +svn:date
316 +V 27
317 +2009-10-20T01:33:43.159959Z
318 +PROPS-END
319 +
320 +Node-path: trunk/Makefile
321 +Node-kind: file
322 +Node-action: change
323 +Text-content-length: 2521
324 +Text-content-md5: 0668418a621333f4aa8b6632cd63e2a0
325 +Content-length: 2521
326 +
327 +# -DCOLLISION_CHECK if you believe that SHA1's
328 +# 1461501637330902918203684832716283019655932542976 hashes do not give you
329 +# enough guarantees about no collisions between objects ever hapenning.
330 +#
331 +# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
332 +# Note that you need some new glibc (at least >2.2.4) for this, and it will
333 +# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
334 +# break unless your underlying filesystem supports those sub-second times
335 +# (my ext3 doesn't).
336 +CFLAGS=-g -O3 -Wall
337 +
338 +CC=gcc
339 +
340 +
341 +PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
342 + cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
343 + check-files ls-tree merge-base merge-cache
344 +
345 +all: $(PROG)
346 +
347 +install: $(PROG)
348 + install $(PROG) $(HOME)/bin/
349 +
350 +LIBS= -lssl -lz
351 +
352 +init-db: init-db.o
353 +
354 +update-cache: update-cache.o read-cache.o
355 + $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
356 +
357 +show-diff: show-diff.o read-cache.o
358 + $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
359 +
360 +write-tree: write-tree.o read-cache.o
361 + $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
362 +
363 +read-tree: read-tree.o read-cache.o
364 + $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
365 +
366 +commit-tree: commit-tree.o read-cache.o
367 + $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
368 +
369 +cat-file: cat-file.o read-cache.o
370 + $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
371 +
372 +fsck-cache: fsck-cache.o read-cache.o
373 + $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
374 +
375 +checkout-cache: checkout-cache.o read-cache.o
376 + $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
377 +
378 +diff-tree: diff-tree.o read-cache.o
379 + $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
380 +
381 +rev-tree: rev-tree.o read-cache.o
382 + $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
383 +
384 +show-files: show-files.o read-cache.o
385 + $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
386 +
387 +check-files: check-files.o read-cache.o
388 + $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
389 +
390 +ls-tree: ls-tree.o read-cache.o
391 + $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
392 +
393 +merge-base: merge-base.o read-cache.o
394 + $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
395 +
396 +merge-cache: merge-cache.o read-cache.o
397 + $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
398 +
399 +read-cache.o: cache.h
400 +show-diff.o: cache.h
401 +
402 +clean:
403 + rm -f *.o $(PROG)
404 +
405 +backup: clean
406 + cd .. ; tar czvf dircache.tar.gz dir-cache
407 +
408 +
409 +Revision-number: 6
410 +Prop-content-length: 112
411 +Content-length: 112
412 +
413 +K 7
414 +svn:log
415 +V 13
416 +left update 2
417 +K 10
418 +svn:author
419 +V 4
420 +samv
421 +K 8
422 +svn:date
423 +V 27
424 +2009-10-20T01:33:44.164175Z
425 +PROPS-END
426 +
427 +Node-path: branches/left/Makefile
428 +Node-kind: file
429 +Node-action: change
430 +Text-content-length: 2529
431 +Text-content-md5: f6b197cc3f2e89a83e545d4bb003de73
432 +Content-length: 2529
433 +
434 +# -DCOLLISION_CHECK if you believe that SHA1's
435 +# 1461501637330902918203684832716283019655932542976 hashes do not give you
436 +# enough guarantees about no collisions between objects ever hapenning.
437 +#
438 +# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
439 +# Note that you need some new glibc (at least >2.2.4) for this, and it will
440 +# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
441 +# break unless your underlying filesystem supports those sub-second times
442 +# (my ext3 doesn't).
443 +CFLAGS=-g -O3 -Wall
444 +
445 +CC=gcc
446 +
447 +
448 +PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
449 + cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
450 + check-files ls-tree merge-base
451 +
452 +all: $(PROG)
453 +
454 +install: $(PROG)
455 + install $(PROG) $(HOME)/bin/
456 +
457 +LIBS= -lssl -lz
458 +
459 +init-db: init-db.o
460 +
461 +update-cache: update-cache.o read-cache.o
462 + $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
463 +
464 +show-diff: show-diff.o read-cache.o
465 + $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
466 +
467 +write-tree: write-tree.o read-cache.o
468 + $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
469 +
470 +read-tree: read-tree.o read-cache.o
471 + $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
472 +
473 +commit-tree: commit-tree.o read-cache.o
474 + $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
475 +
476 +cat-file: cat-file.o read-cache.o
477 + $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
478 +
479 +fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
480 + $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
481 +
482 +checkout-cache: checkout-cache.o read-cache.o
483 + $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
484 +
485 +diff-tree: diff-tree.o read-cache.o
486 + $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
487 +
488 +rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
489 + $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
490 +
491 +show-files: show-files.o read-cache.o
492 + $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
493 +
494 +check-files: check-files.o read-cache.o
495 + $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
496 +
497 +ls-tree: ls-tree.o read-cache.o
498 + $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
499 +
500 +merge-base: merge-base.o read-cache.o
501 + $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
502 +
503 +read-cache.o: cache.h
504 +show-diff.o: cache.h
505 +
506 +clean:
507 + rm -f *.o $(PROG)
508 +
509 +backup: clean
510 + cd .. ; tar czvf dircache.tar.gz dir-cache
511 +
512 +
513 +Revision-number: 7
514 +Prop-content-length: 112
515 +Content-length: 112
516 +
517 +K 7
518 +svn:log
519 +V 13
520 +left update 3
521 +K 10
522 +svn:author
523 +V 4
524 +samv
525 +K 8
526 +svn:date
527 +V 27
528 +2009-10-20T01:33:45.144214Z
529 +PROPS-END
530 +
531 +Node-path: branches/left/Makefile
532 +Node-kind: file
533 +Node-action: change
534 +Text-content-length: 2593
535 +Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba
536 +Content-length: 2593
537 +
538 +# -DCOLLISION_CHECK if you believe that SHA1's
539 +# 1461501637330902918203684832716283019655932542976 hashes do not give you
540 +# enough guarantees about no collisions between objects ever hapenning.
541 +#
542 +# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
543 +# Note that you need some new glibc (at least >2.2.4) for this, and it will
544 +# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
545 +# break unless your underlying filesystem supports those sub-second times
546 +# (my ext3 doesn't).
547 +CFLAGS=-g -O3 -Wall
548 +
549 +CC=gcc
550 +
551 +
552 +PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
553 + cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
554 + check-files ls-tree merge-base
555 +
556 +all: $(PROG)
557 +
558 +install: $(PROG)
559 + install $(PROG) $(HOME)/bin/
560 +
561 +LIBS= -lssl -lz
562 +
563 +init-db: init-db.o
564 +
565 +update-cache: update-cache.o read-cache.o
566 + $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
567 +
568 +show-diff: show-diff.o read-cache.o
569 + $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
570 +
571 +write-tree: write-tree.o read-cache.o
572 + $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
573 +
574 +read-tree: read-tree.o read-cache.o
575 + $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
576 +
577 +commit-tree: commit-tree.o read-cache.o
578 + $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
579 +
580 +cat-file: cat-file.o read-cache.o
581 + $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
582 +
583 +fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
584 + $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
585 +
586 +checkout-cache: checkout-cache.o read-cache.o
587 + $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
588 +
589 +diff-tree: diff-tree.o read-cache.o
590 + $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
591 +
592 +rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
593 + $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
594 +
595 +show-files: show-files.o read-cache.o
596 + $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
597 +
598 +check-files: check-files.o read-cache.o
599 + $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
600 +
601 +ls-tree: ls-tree.o read-cache.o
602 + $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
603 +
604 +merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
605 + $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
606 +
607 +read-cache.o: cache.h
608 +show-diff.o: cache.h
609 +
610 +clean:
611 + rm -f *.o $(PROG)
612 +
613 +backup: clean
614 + cd .. ; tar czvf dircache.tar.gz dir-cache
615 +
616 +
617 +Revision-number: 8
618 +Prop-content-length: 110
619 +Content-length: 110
620 +
621 +K 7
622 +svn:log
623 +V 11
624 +Merge trunk
625 +K 10
626 +svn:author
627 +V 4
628 +samv
629 +K 8
630 +svn:date
631 +V 27
632 +2009-10-20T01:33:48.176135Z
633 +PROPS-END
634 +
635 +Node-path: trunk
636 +Node-kind: dir
637 +Node-action: change
638 +Prop-content-length: 53
639 +Content-length: 53
640 +
641 +K 13
642 +svn:mergeinfo
643 +V 18
644 +/branches/left:2-7
645 +PROPS-END
646 +
647 +
648 +Node-path: trunk/Makefile
649 +Node-kind: file
650 +Node-action: change
651 +Text-content-length: 2713
652 +Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
653 +Content-length: 2713
654 +
655 +# -DCOLLISION_CHECK if you believe that SHA1's
656 +# 1461501637330902918203684832716283019655932542976 hashes do not give you
657 +# enough guarantees about no collisions between objects ever hapenning.
658 +#
659 +# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
660 +# Note that you need some new glibc (at least >2.2.4) for this, and it will
661 +# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
662 +# break unless your underlying filesystem supports those sub-second times
663 +# (my ext3 doesn't).
664 +CFLAGS=-g -O3 -Wall
665 +
666 +CC=gcc
667 +
668 +
669 +PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
670 + cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
671 + check-files ls-tree merge-base merge-cache
672 +
673 +all: $(PROG)
674 +
675 +install: $(PROG)
676 + install $(PROG) $(HOME)/bin/
677 +
678 +LIBS= -lssl -lz
679 +
680 +init-db: init-db.o
681 +
682 +update-cache: update-cache.o read-cache.o
683 + $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
684 +
685 +show-diff: show-diff.o read-cache.o
686 + $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
687 +
688 +write-tree: write-tree.o read-cache.o
689 + $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
690 +
691 +read-tree: read-tree.o read-cache.o
692 + $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
693 +
694 +commit-tree: commit-tree.o read-cache.o
695 + $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
696 +
697 +cat-file: cat-file.o read-cache.o
698 + $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
699 +
700 +fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
701 + $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
702 +
703 +checkout-cache: checkout-cache.o read-cache.o
704 + $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
705 +
706 +diff-tree: diff-tree.o read-cache.o
707 + $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
708 +
709 +rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
710 + $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
711 +
712 +show-files: show-files.o read-cache.o
713 + $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
714 +
715 +check-files: check-files.o read-cache.o
716 + $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
717 +
718 +ls-tree: ls-tree.o read-cache.o
719 + $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
720 +
721 +merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
722 + $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
723 +
724 +merge-cache: merge-cache.o read-cache.o
725 + $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
726 +
727 +read-cache.o: cache.h
728 +show-diff.o: cache.h
729 +
730 +clean:
731 + rm -f *.o $(PROG)
732 +
733 +backup: clean
734 + cd .. ; tar czvf dircache.tar.gz dir-cache
735 +
736 +