git.oblomov.eu Git - git/blob - t/t9151/svn-mergeinfo.dump

   1 SVN-fs-dump-format-version: 2
   2
   3 UUID: 64142547-0943-4db2-836a-d1e1eb2f9924
   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-12-19T16:17:51.232640Z
  13 PROPS-END
  14
  15 Revision-number: 1
  16 Prop-content-length: 128
  17 Content-length: 128
  18
  19 K 7
  20 svn:log
  21 V 29
  22 (r1) 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-12-19T16:17:51.831965Z
  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: 112
  53 Content-length: 112
  54
  55 K 7
  56 svn:log
  57 V 13
  58 (r2) ancestor
  59 K 10
  60 svn:author
  61 V 4
  62 samv
  63 K 8
  64 svn:date
  65 V 27
  66 2009-12-19T16:17:52.300075Z
  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 Text-content-sha1: 103205ce331f7d64086dba497574734f78439590
  76 Content-length: 2411
  77
  78 PROPS-END
  79 # -DCOLLISION_CHECK if you believe that SHA1's
  80 # 1461501637330902918203684832716283019655932542976 hashes do not give you
  81 # enough guarantees about no collisions between objects ever hapenning.
  82 #
  83 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
  84 # Note that you need some new glibc (at least >2.2.4) for this, and it will
  85 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
  86 # break unless your underlying filesystem supports those sub-second times
  87 # (my ext3 doesn't).
  88 CFLAGS=-g -O3 -Wall
  89
  90 CC=gcc
  91
  92
  93 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
  94         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
  95         check-files ls-tree merge-base
  96
  97 all: $(PROG)
  98
  99 install: $(PROG)
 100         install $(PROG) $(HOME)/bin/
 101
 102 LIBS= -lssl -lz
 103
 104 init-db: init-db.o
 105
 106 update-cache: update-cache.o read-cache.o
 107         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 108
 109 show-diff: show-diff.o read-cache.o
 110         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 111
 112 write-tree: write-tree.o read-cache.o
 113         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 114
 115 read-tree: read-tree.o read-cache.o
 116         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 117
 118 commit-tree: commit-tree.o read-cache.o
 119         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 120
 121 cat-file: cat-file.o read-cache.o
 122         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 123
 124 fsck-cache: fsck-cache.o read-cache.o
 125         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
 126
 127 checkout-cache: checkout-cache.o read-cache.o
 128         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 129
 130 diff-tree: diff-tree.o read-cache.o
 131         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 132
 133 rev-tree: rev-tree.o read-cache.o
 134         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
 135
 136 show-files: show-files.o read-cache.o
 137         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 138
 139 check-files: check-files.o read-cache.o
 140         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 141
 142 ls-tree: ls-tree.o read-cache.o
 143         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 144
 145 merge-base: merge-base.o read-cache.o
 146         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 147
 148 read-cache.o: cache.h
 149 show-diff.o: cache.h
 150
 151 clean:
 152         rm -f *.o $(PROG)
 153
 154 backup: clean
 155         cd .. ; tar czvf dircache.tar.gz dir-cache
 156
 157
 158 Revision-number: 3
 159 Prop-content-length: 120
 160 Content-length: 120
 161
 162 K 7
 163 svn:log
 164 V 21
 165 (r3) make left branch
 166 K 10
 167 svn:author
 168 V 4
 169 samv
 170 K 8
 171 svn:date
 172 V 27
 173 2009-12-19T16:17:52.768800Z
 174 PROPS-END
 175
 176 Node-path: branches/left
 177 Node-kind: dir
 178 Node-action: add
 179 Node-copyfrom-rev: 1
 180 Node-copyfrom-path: trunk
 181
 182
 183 Node-path: branches/left/Makefile
 184 Node-kind: file
 185 Node-action: add
 186 Node-copyfrom-rev: 2
 187 Node-copyfrom-path: trunk/Makefile
 188 Text-copy-source-md5: bfd8ff778d1492dc6758567373176a89
 189 Text-copy-source-sha1: 103205ce331f7d64086dba497574734f78439590
 190
 191
 192 Revision-number: 4
 193 Prop-content-length: 121
 194 Content-length: 121
 195
 196 K 7
 197 svn:log
 198 V 22
 199 (r4) make right branch
 200 K 10
 201 svn:author
 202 V 4
 203 samv
 204 K 8
 205 svn:date
 206 V 27
 207 2009-12-19T16:17:53.177879Z
 208 PROPS-END
 209
 210 Node-path: branches/right
 211 Node-kind: dir
 212 Node-action: add
 213 Node-copyfrom-rev: 1
 214 Node-copyfrom-path: trunk
 215
 216
 217 Node-path: branches/right/Makefile
 218 Node-kind: file
 219 Node-action: add
 220 Node-copyfrom-rev: 2
 221 Node-copyfrom-path: trunk/Makefile
 222 Text-copy-source-md5: bfd8ff778d1492dc6758567373176a89
 223 Text-copy-source-sha1: 103205ce331f7d64086dba497574734f78439590
 224
 225
 226 Revision-number: 5
 227 Prop-content-length: 117
 228 Content-length: 117
 229
 230 K 7
 231 svn:log
 232 V 18
 233 (r5) left update 1
 234 K 10
 235 svn:author
 236 V 4
 237 samv
 238 K 8
 239 svn:date
 240 V 27
 241 2009-12-19T16:17:53.604691Z
 242 PROPS-END
 243
 244 Node-path: branches/left/Makefile
 245 Node-kind: file
 246 Node-action: change
 247 Text-content-length: 2465
 248 Text-content-md5: 16e38d9753b061731650561ce01b1195
 249 Text-content-sha1: 36da4b84ea9b64218ab48171dfc5c48ae025f38b
 250 Content-length: 2465
 251
 252 # -DCOLLISION_CHECK if you believe that SHA1's
 253 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 254 # enough guarantees about no collisions between objects ever hapenning.
 255 #
 256 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
 257 # Note that you need some new glibc (at least >2.2.4) for this, and it will
 258 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 259 # break unless your underlying filesystem supports those sub-second times
 260 # (my ext3 doesn't).
 261 CFLAGS=-g -O3 -Wall
 262
 263 CC=gcc
 264
 265
 266 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
 267         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
 268         check-files ls-tree merge-base
 269
 270 all: $(PROG)
 271
 272 install: $(PROG)
 273         install $(PROG) $(HOME)/bin/
 274
 275 LIBS= -lssl -lz
 276
 277 init-db: init-db.o
 278
 279 update-cache: update-cache.o read-cache.o
 280         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 281
 282 show-diff: show-diff.o read-cache.o
 283         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 284
 285 write-tree: write-tree.o read-cache.o
 286         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 287
 288 read-tree: read-tree.o read-cache.o
 289         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 290
 291 commit-tree: commit-tree.o read-cache.o
 292         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 293
 294 cat-file: cat-file.o read-cache.o
 295         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 296
 297 fsck-cache: fsck-cache.o read-cache.o
 298         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
 299
 300 checkout-cache: checkout-cache.o read-cache.o
 301         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 302
 303 diff-tree: diff-tree.o read-cache.o
 304         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 305
 306 rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
 307         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 308
 309 show-files: show-files.o read-cache.o
 310         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 311
 312 check-files: check-files.o read-cache.o
 313         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 314
 315 ls-tree: ls-tree.o read-cache.o
 316         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 317
 318 merge-base: merge-base.o read-cache.o
 319         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 320
 321 read-cache.o: cache.h
 322 show-diff.o: cache.h
 323
 324 clean:
 325         rm -f *.o $(PROG)
 326
 327 backup: clean
 328         cd .. ; tar czvf dircache.tar.gz dir-cache
 329
 330
 331 Revision-number: 6
 332 Prop-content-length: 118
 333 Content-length: 118
 334
 335 K 7
 336 svn:log
 337 V 19
 338 (r6) right update 1
 339 K 10
 340 svn:author
 341 V 4
 342 samv
 343 K 8
 344 svn:date
 345 V 27
 346 2009-12-19T16:17:54.063555Z
 347 PROPS-END
 348
 349 Node-path: branches/right/Makefile
 350 Node-kind: file
 351 Node-action: change
 352 Text-content-length: 2521
 353 Text-content-md5: 0668418a621333f4aa8b6632cd63e2a0
 354 Text-content-sha1: 4f29afd038e52f45acb5ef8c41acfc70062a741a
 355 Content-length: 2521
 356
 357 # -DCOLLISION_CHECK if you believe that SHA1's
 358 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 359 # enough guarantees about no collisions between objects ever hapenning.
 360 #
 361 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
 362 # Note that you need some new glibc (at least >2.2.4) for this, and it will
 363 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 364 # break unless your underlying filesystem supports those sub-second times
 365 # (my ext3 doesn't).
 366 CFLAGS=-g -O3 -Wall
 367
 368 CC=gcc
 369
 370
 371 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
 372         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
 373         check-files ls-tree merge-base merge-cache
 374
 375 all: $(PROG)
 376
 377 install: $(PROG)
 378         install $(PROG) $(HOME)/bin/
 379
 380 LIBS= -lssl -lz
 381
 382 init-db: init-db.o
 383
 384 update-cache: update-cache.o read-cache.o
 385         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 386
 387 show-diff: show-diff.o read-cache.o
 388         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 389
 390 write-tree: write-tree.o read-cache.o
 391         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 392
 393 read-tree: read-tree.o read-cache.o
 394         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 395
 396 commit-tree: commit-tree.o read-cache.o
 397         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 398
 399 cat-file: cat-file.o read-cache.o
 400         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 401
 402 fsck-cache: fsck-cache.o read-cache.o
 403         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
 404
 405 checkout-cache: checkout-cache.o read-cache.o
 406         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 407
 408 diff-tree: diff-tree.o read-cache.o
 409         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 410
 411 rev-tree: rev-tree.o read-cache.o
 412         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
 413
 414 show-files: show-files.o read-cache.o
 415         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 416
 417 check-files: check-files.o read-cache.o
 418         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 419
 420 ls-tree: ls-tree.o read-cache.o
 421         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 422
 423 merge-base: merge-base.o read-cache.o
 424         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 425
 426 merge-cache: merge-cache.o read-cache.o
 427         $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
 428
 429 read-cache.o: cache.h
 430 show-diff.o: cache.h
 431
 432 clean:
 433         rm -f *.o $(PROG)
 434
 435 backup: clean
 436         cd .. ; tar czvf dircache.tar.gz dir-cache
 437
 438
 439 Revision-number: 7
 440 Prop-content-length: 117
 441 Content-length: 117
 442
 443 K 7
 444 svn:log
 445 V 18
 446 (r7) left update 2
 447 K 10
 448 svn:author
 449 V 4
 450 samv
 451 K 8
 452 svn:date
 453 V 27
 454 2009-12-19T16:17:54.523904Z
 455 PROPS-END
 456
 457 Node-path: branches/left/Makefile
 458 Node-kind: file
 459 Node-action: change
 460 Text-content-length: 2529
 461 Text-content-md5: f6b197cc3f2e89a83e545d4bb003de73
 462 Text-content-sha1: 2f656677cfec0bceec85e53036ffb63e25126f8e
 463 Content-length: 2529
 464
 465 # -DCOLLISION_CHECK if you believe that SHA1's
 466 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 467 # enough guarantees about no collisions between objects ever hapenning.
 468 #
 469 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
 470 # Note that you need some new glibc (at least >2.2.4) for this, and it will
 471 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 472 # break unless your underlying filesystem supports those sub-second times
 473 # (my ext3 doesn't).
 474 CFLAGS=-g -O3 -Wall
 475
 476 CC=gcc
 477
 478
 479 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
 480         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
 481         check-files ls-tree merge-base
 482
 483 all: $(PROG)
 484
 485 install: $(PROG)
 486         install $(PROG) $(HOME)/bin/
 487
 488 LIBS= -lssl -lz
 489
 490 init-db: init-db.o
 491
 492 update-cache: update-cache.o read-cache.o
 493         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 494
 495 show-diff: show-diff.o read-cache.o
 496         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 497
 498 write-tree: write-tree.o read-cache.o
 499         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 500
 501 read-tree: read-tree.o read-cache.o
 502         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 503
 504 commit-tree: commit-tree.o read-cache.o
 505         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 506
 507 cat-file: cat-file.o read-cache.o
 508         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 509
 510 fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
 511         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 512
 513 checkout-cache: checkout-cache.o read-cache.o
 514         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 515
 516 diff-tree: diff-tree.o read-cache.o
 517         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 518
 519 rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
 520         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 521
 522 show-files: show-files.o read-cache.o
 523         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 524
 525 check-files: check-files.o read-cache.o
 526         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 527
 528 ls-tree: ls-tree.o read-cache.o
 529         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 530
 531 merge-base: merge-base.o read-cache.o
 532         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 533
 534 read-cache.o: cache.h
 535 show-diff.o: cache.h
 536
 537 clean:
 538         rm -f *.o $(PROG)
 539
 540 backup: clean
 541         cd .. ; tar czvf dircache.tar.gz dir-cache
 542
 543
 544 Revision-number: 8
 545 Prop-content-length: 117
 546 Content-length: 117
 547
 548 K 7
 549 svn:log
 550 V 18
 551 (r8) left update 3
 552 K 10
 553 svn:author
 554 V 4
 555 samv
 556 K 8
 557 svn:date
 558 V 27
 559 2009-12-19T16:17:54.975970Z
 560 PROPS-END
 561
 562 Node-path: branches/left/Makefile
 563 Node-kind: file
 564 Node-action: change
 565 Text-content-length: 2593
 566 Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba
 567 Text-content-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
 568 Content-length: 2593
 569
 570 # -DCOLLISION_CHECK if you believe that SHA1's
 571 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 572 # enough guarantees about no collisions between objects ever hapenning.
 573 #
 574 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
 575 # Note that you need some new glibc (at least >2.2.4) for this, and it will
 576 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 577 # break unless your underlying filesystem supports those sub-second times
 578 # (my ext3 doesn't).
 579 CFLAGS=-g -O3 -Wall
 580
 581 CC=gcc
 582
 583
 584 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
 585         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
 586         check-files ls-tree merge-base
 587
 588 all: $(PROG)
 589
 590 install: $(PROG)
 591         install $(PROG) $(HOME)/bin/
 592
 593 LIBS= -lssl -lz
 594
 595 init-db: init-db.o
 596
 597 update-cache: update-cache.o read-cache.o
 598         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 599
 600 show-diff: show-diff.o read-cache.o
 601         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 602
 603 write-tree: write-tree.o read-cache.o
 604         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 605
 606 read-tree: read-tree.o read-cache.o
 607         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 608
 609 commit-tree: commit-tree.o read-cache.o
 610         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 611
 612 cat-file: cat-file.o read-cache.o
 613         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 614
 615 fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
 616         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 617
 618 checkout-cache: checkout-cache.o read-cache.o
 619         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 620
 621 diff-tree: diff-tree.o read-cache.o
 622         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 623
 624 rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
 625         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 626
 627 show-files: show-files.o read-cache.o
 628         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 629
 630 check-files: check-files.o read-cache.o
 631         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 632
 633 ls-tree: ls-tree.o read-cache.o
 634         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 635
 636 merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
 637         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 638
 639 read-cache.o: cache.h
 640 show-diff.o: cache.h
 641
 642 clean:
 643         rm -f *.o $(PROG)
 644
 645 backup: clean
 646         cd .. ; tar czvf dircache.tar.gz dir-cache
 647
 648
 649 Revision-number: 9
 650 Prop-content-length: 124
 651 Content-length: 124
 652
 653 K 7
 654 svn:log
 655 V 25
 656 (r9) make left sub-branch
 657 K 10
 658 svn:author
 659 V 4
 660 samv
 661 K 8
 662 svn:date
 663 V 27
 664 2009-12-19T16:17:55.459904Z
 665 PROPS-END
 666
 667 Node-path: branches/left-sub
 668 Node-kind: dir
 669 Node-action: add
 670 Node-copyfrom-rev: 3
 671 Node-copyfrom-path: branches/left
 672
 673
 674 Node-path: branches/left-sub/Makefile
 675 Node-kind: file
 676 Node-action: delete
 677
 678 Node-path: branches/left-sub/Makefile
 679 Node-kind: file
 680 Node-action: add
 681 Node-copyfrom-rev: 8
 682 Node-copyfrom-path: branches/left/Makefile
 683 Text-copy-source-md5: 5ccff689fb290e00b85fe18ee50c54ba
 684 Text-copy-source-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
 685
 686
 687
 688
 689 Revision-number: 10
 690 Prop-content-length: 129
 691 Content-length: 129
 692
 693 K 7
 694 svn:log
 695 V 30
 696 (r10) left sub-branch update 1
 697 K 10
 698 svn:author
 699 V 4
 700 samv
 701 K 8
 702 svn:date
 703 V 27
 704 2009-12-19T16:17:55.862113Z
 705 PROPS-END
 706
 707 Node-path: branches/left-sub/README
 708 Node-kind: file
 709 Node-action: add
 710 Prop-content-length: 10
 711 Text-content-length: 7
 712 Text-content-md5: fdbcfb6be9afe1121862143f226b51cf
 713 Text-content-sha1: 1d1f5ea4ceb584337ffe59b8980d92e3b78dfef4
 714 Content-length: 17
 715
 716 PROPS-END
 717 crunch
 718
 719
 720 Revision-number: 11
 721 Prop-content-length: 126
 722 Content-length: 126
 723
 724 K 7
 725 svn:log
 726 V 27
 727 (r11) Merge left to trunk 1
 728 K 10
 729 svn:author
 730 V 4
 731 samv
 732 K 8
 733 svn:date
 734 V 27
 735 2009-12-19T16:17:56.413416Z
 736 PROPS-END
 737
 738 Node-path: trunk
 739 Node-kind: dir
 740 Node-action: change
 741 Prop-content-length: 54
 742 Content-length: 54
 743
 744 K 13
 745 svn:mergeinfo
 746 V 19
 747 /branches/left:2-10
 748 PROPS-END
 749
 750
 751 Node-path: trunk/Makefile
 752 Node-kind: file
 753 Node-action: change
 754 Text-content-length: 2593
 755 Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba
 756 Text-content-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
 757 Content-length: 2593
 758
 759 # -DCOLLISION_CHECK if you believe that SHA1's
 760 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 761 # enough guarantees about no collisions between objects ever hapenning.
 762 #
 763 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
 764 # Note that you need some new glibc (at least >2.2.4) for this, and it will
 765 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 766 # break unless your underlying filesystem supports those sub-second times
 767 # (my ext3 doesn't).
 768 CFLAGS=-g -O3 -Wall
 769
 770 CC=gcc
 771
 772
 773 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
 774         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
 775         check-files ls-tree merge-base
 776
 777 all: $(PROG)
 778
 779 install: $(PROG)
 780         install $(PROG) $(HOME)/bin/
 781
 782 LIBS= -lssl -lz
 783
 784 init-db: init-db.o
 785
 786 update-cache: update-cache.o read-cache.o
 787         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 788
 789 show-diff: show-diff.o read-cache.o
 790         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 791
 792 write-tree: write-tree.o read-cache.o
 793         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 794
 795 read-tree: read-tree.o read-cache.o
 796         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 797
 798 commit-tree: commit-tree.o read-cache.o
 799         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 800
 801 cat-file: cat-file.o read-cache.o
 802         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 803
 804 fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
 805         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 806
 807 checkout-cache: checkout-cache.o read-cache.o
 808         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 809
 810 diff-tree: diff-tree.o read-cache.o
 811         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 812
 813 rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
 814         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 815
 816 show-files: show-files.o read-cache.o
 817         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 818
 819 check-files: check-files.o read-cache.o
 820         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 821
 822 ls-tree: ls-tree.o read-cache.o
 823         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 824
 825 merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
 826         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 827
 828 read-cache.o: cache.h
 829 show-diff.o: cache.h
 830
 831 clean:
 832         rm -f *.o $(PROG)
 833
 834 backup: clean
 835         cd .. ; tar czvf dircache.tar.gz dir-cache
 836
 837
 838 Revision-number: 12
 839 Prop-content-length: 118
 840 Content-length: 118
 841
 842 K 7
 843 svn:log
 844 V 19
 845 (r12) left update 4
 846 K 10
 847 svn:author
 848 V 4
 849 samv
 850 K 8
 851 svn:date
 852 V 27
 853 2009-12-19T16:17:56.831014Z
 854 PROPS-END
 855
 856 Node-path: branches/left/zlonk
 857 Node-kind: file
 858 Node-action: add
 859 Prop-content-length: 10
 860 Text-content-length: 7
 861 Text-content-md5: 8b9d8c7c2aaa6167e7d3407a773bbbba
 862 Text-content-sha1: 9716527ebd70a75c27625cacbeb2d897c6e86178
 863 Content-length: 17
 864
 865 PROPS-END
 866 touche
 867
 868
 869 Revision-number: 13
 870 Prop-content-length: 119
 871 Content-length: 119
 872
 873 K 7
 874 svn:log
 875 V 20
 876 (r13) right update 2
 877 K 10
 878 svn:author
 879 V 4
 880 samv
 881 K 8
 882 svn:date
 883 V 27
 884 2009-12-19T16:17:57.341143Z
 885 PROPS-END
 886
 887 Node-path: branches/right/bang
 888 Node-kind: file
 889 Node-action: add
 890 Prop-content-length: 10
 891 Text-content-length: 8
 892 Text-content-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
 893 Text-content-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
 894 Content-length: 18
 895
 896 PROPS-END
 897 thwacke
 898
 899
 900 Revision-number: 14
 901 Prop-content-length: 141
 902 Content-length: 141
 903
 904 K 7
 905 svn:log
 906 V 42
 907 (r14) Cherry-pick right 2 commits to trunk
 908 K 10
 909 svn:author
 910 V 4
 911 samv
 912 K 8
 913 svn:date
 914 V 27
 915 2009-12-19T16:17:57.841851Z
 916 PROPS-END
 917
 918 Node-path: trunk
 919 Node-kind: dir
 920 Node-action: change
 921 Prop-content-length: 75
 922 Content-length: 75
 923
 924 K 13
 925 svn:mergeinfo
 926 V 40
 927 /branches/left:2-10
 928 /branches/right:6-13
 929 PROPS-END
 930
 931
 932 Node-path: trunk/Makefile
 933 Node-kind: file
 934 Node-action: change
 935 Text-content-length: 2713
 936 Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
 937 Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14
 938 Content-length: 2713
 939
 940 # -DCOLLISION_CHECK if you believe that SHA1's
 941 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 942 # enough guarantees about no collisions between objects ever hapenning.
 943 #
 944 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
 945 # Note that you need some new glibc (at least >2.2.4) for this, and it will
 946 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 947 # break unless your underlying filesystem supports those sub-second times
 948 # (my ext3 doesn't).
 949 CFLAGS=-g -O3 -Wall
 950
 951 CC=gcc
 952
 953
 954 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
 955         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
 956         check-files ls-tree merge-base merge-cache
 957
 958 all: $(PROG)
 959
 960 install: $(PROG)
 961         install $(PROG) $(HOME)/bin/
 962
 963 LIBS= -lssl -lz
 964
 965 init-db: init-db.o
 966
 967 update-cache: update-cache.o read-cache.o
 968         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 969
 970 show-diff: show-diff.o read-cache.o
 971         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 972
 973 write-tree: write-tree.o read-cache.o
 974         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 975
 976 read-tree: read-tree.o read-cache.o
 977         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 978
 979 commit-tree: commit-tree.o read-cache.o
 980         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 981
 982 cat-file: cat-file.o read-cache.o
 983         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 984
 985 fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
 986         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 987
 988 checkout-cache: checkout-cache.o read-cache.o
 989         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 990
 991 diff-tree: diff-tree.o read-cache.o
 992         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 993
 994 rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
 995         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 996
 997 show-files: show-files.o read-cache.o
 998         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 999
1000 check-files: check-files.o read-cache.o
1001         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
1002
1003 ls-tree: ls-tree.o read-cache.o
1004         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
1005
1006 merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
1007         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1008
1009 merge-cache: merge-cache.o read-cache.o
1010         $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
1011
1012 read-cache.o: cache.h
1013 show-diff.o: cache.h
1014
1015 clean:
1016         rm -f *.o $(PROG)
1017
1018 backup: clean
1019         cd .. ; tar czvf dircache.tar.gz dir-cache
1020
1021
1022 Node-path: trunk/bang
1023 Node-kind: file
1024 Node-action: add
1025 Node-copyfrom-rev: 13
1026 Node-copyfrom-path: branches/right/bang
1027 Text-copy-source-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
1028 Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
1029
1030
1031 Revision-number: 15
1032 Prop-content-length: 127
1033 Content-length: 127
1034
1035 K 7
1036 svn:log
1037 V 28
1038 (r15) Merge right to trunk 1
1039 K 10
1040 svn:author
1041 V 4
1042 samv
1043 K 8
1044 svn:date
1045 V 27
1046 2009-12-19T16:17:58.368520Z
1047 PROPS-END
1048
1049 Node-path: trunk
1050 Node-kind: dir
1051 Node-action: change
1052 Prop-content-length: 75
1053 Content-length: 75
1054
1055 K 13
1056 svn:mergeinfo
1057 V 40
1058 /branches/left:2-10
1059 /branches/right:2-14
1060 PROPS-END
1061
1062
1063 Revision-number: 16
1064 Prop-content-length: 119
1065 Content-length: 119
1066
1067 K 7
1068 svn:log
1069 V 20
1070 (r16) right update 3
1071 K 10
1072 svn:author
1073 V 4
1074 samv
1075 K 8
1076 svn:date
1077 V 27
1078 2009-12-19T16:17:58.779056Z
1079 PROPS-END
1080
1081 Node-path: branches/right/urkkk
1082 Node-kind: file
1083 Node-action: add
1084 Prop-content-length: 10
1085 Text-content-length: 6
1086 Text-content-md5: 5889c8392e16251b0c80927607a03036
1087 Text-content-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1088 Content-length: 16
1089
1090 PROPS-END
1091 whamm
1092
1093
1094 Revision-number: 17
1095 Prop-content-length: 119
1096 Content-length: 119
1097
1098 K 7
1099 svn:log
1100 V 20
1101 (r17) trunk update 1
1102 K 10
1103 svn:author
1104 V 4
1105 samv
1106 K 8
1107 svn:date
1108 V 27
1109 2009-12-19T16:17:59.221851Z
1110 PROPS-END
1111
1112 Node-path: trunk/vronk
1113 Node-kind: file
1114 Node-action: add
1115 Prop-content-length: 10
1116 Text-content-length: 4
1117 Text-content-md5: b2f80fa02a7f1364b9c29d3da44bf9f9
1118 Text-content-sha1: e994d980c0f2d7a3f76138bf96d57f36f9633828
1119 Content-length: 14
1120
1121 PROPS-END
1122 pow
1123
1124
1125 Revision-number: 18
1126 Prop-content-length: 135
1127 Content-length: 135
1128
1129 K 7
1130 svn:log
1131 V 36
1132 (r18) Merge right to left sub-branch
1133 K 10
1134 svn:author
1135 V 4
1136 samv
1137 K 8
1138 svn:date
1139 V 27
1140 2009-12-19T16:17:59.781666Z
1141 PROPS-END
1142
1143 Node-path: branches/left-sub
1144 Node-kind: dir
1145 Node-action: change
1146 Prop-content-length: 55
1147 Content-length: 55
1148
1149 K 13
1150 svn:mergeinfo
1151 V 20
1152 /branches/right:2-17
1153 PROPS-END
1154
1155
1156 Node-path: branches/left-sub/Makefile
1157 Node-kind: file
1158 Node-action: change
1159 Text-content-length: 2713
1160 Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
1161 Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14
1162 Content-length: 2713
1163
1164 # -DCOLLISION_CHECK if you believe that SHA1's
1165 # 1461501637330902918203684832716283019655932542976 hashes do not give you
1166 # enough guarantees about no collisions between objects ever hapenning.
1167 #
1168 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
1169 # Note that you need some new glibc (at least >2.2.4) for this, and it will
1170 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
1171 # break unless your underlying filesystem supports those sub-second times
1172 # (my ext3 doesn't).
1173 CFLAGS=-g -O3 -Wall
1174
1175 CC=gcc
1176
1177
1178 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
1179         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
1180         check-files ls-tree merge-base merge-cache
1181
1182 all: $(PROG)
1183
1184 install: $(PROG)
1185         install $(PROG) $(HOME)/bin/
1186
1187 LIBS= -lssl -lz
1188
1189 init-db: init-db.o
1190
1191 update-cache: update-cache.o read-cache.o
1192         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
1193
1194 show-diff: show-diff.o read-cache.o
1195         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
1196
1197 write-tree: write-tree.o read-cache.o
1198         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
1199
1200 read-tree: read-tree.o read-cache.o
1201         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
1202
1203 commit-tree: commit-tree.o read-cache.o
1204         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
1205
1206 cat-file: cat-file.o read-cache.o
1207         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
1208
1209 fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
1210         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1211
1212 checkout-cache: checkout-cache.o read-cache.o
1213         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
1214
1215 diff-tree: diff-tree.o read-cache.o
1216         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
1217
1218 rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
1219         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1220
1221 show-files: show-files.o read-cache.o
1222         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
1223
1224 check-files: check-files.o read-cache.o
1225         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
1226
1227 ls-tree: ls-tree.o read-cache.o
1228         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
1229
1230 merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
1231         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1232
1233 merge-cache: merge-cache.o read-cache.o
1234         $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
1235
1236 read-cache.o: cache.h
1237 show-diff.o: cache.h
1238
1239 clean:
1240         rm -f *.o $(PROG)
1241
1242 backup: clean
1243         cd .. ; tar czvf dircache.tar.gz dir-cache
1244
1245
1246 Node-path: branches/left-sub/bang
1247 Node-kind: file
1248 Node-action: add
1249 Node-copyfrom-rev: 17
1250 Node-copyfrom-path: branches/right/bang
1251 Text-copy-source-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
1252 Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
1253
1254
1255 Node-path: branches/left-sub/urkkk
1256 Node-kind: file
1257 Node-action: add
1258 Node-copyfrom-rev: 17
1259 Node-copyfrom-path: branches/right/urkkk
1260 Text-copy-source-md5: 5889c8392e16251b0c80927607a03036
1261 Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1262
1263
1264 Revision-number: 19
1265 Prop-content-length: 129
1266 Content-length: 129
1267
1268 K 7
1269 svn:log
1270 V 30
1271 (r19) left sub-branch update 2
1272 K 10
1273 svn:author
1274 V 4
1275 samv
1276 K 8
1277 svn:date
1278 V 27
1279 2009-12-19T16:18:00.200531Z
1280 PROPS-END
1281
1282 Node-path: branches/left-sub/wham_eth
1283 Node-kind: file
1284 Node-action: add
1285 Prop-content-length: 10
1286 Text-content-length: 6
1287 Text-content-md5: 757bcd5818572ef3f9580052617c1c8b
1288 Text-content-sha1: b165019b005c199237ba822c4404e771e93b654a
1289 Content-length: 16
1290
1291 PROPS-END
1292 zowie
1293
1294
1295 Revision-number: 20
1296 Prop-content-length: 118
1297 Content-length: 118
1298
1299 K 7
1300 svn:log
1301 V 19
1302 (r20) left update 5
1303 K 10
1304 svn:author
1305 V 4
1306 samv
1307 K 8
1308 svn:date
1309 V 27
1310 2009-12-19T16:18:00.659636Z
1311 PROPS-END
1312
1313 Node-path: branches/left/glurpp
1314 Node-kind: file
1315 Node-action: add
1316 Prop-content-length: 10
1317 Text-content-length: 8
1318 Text-content-md5: 14a169f628e0bb59df9c2160649d0a30
1319 Text-content-sha1: ef7d929e52177767ecfcd28941f6b7f04b4131e3
1320 Content-length: 18
1321
1322 PROPS-END
1323 eee_yow
1324
1325
1326 Revision-number: 21
1327 Prop-content-length: 147
1328 Content-length: 147
1329
1330 K 7
1331 svn:log
1332 V 48
1333 (r21) Cherry-pick left sub-branch commit to left
1334 K 10
1335 svn:author
1336 V 4
1337 samv
1338 K 8
1339 svn:date
1340 V 27
1341 2009-12-19T16:18:01.194402Z
1342 PROPS-END
1343
1344 Node-path: branches/left
1345 Node-kind: dir
1346 Node-action: change
1347 Prop-content-length: 56
1348 Content-length: 56
1349
1350 K 13
1351 svn:mergeinfo
1352 V 21
1353 /branches/left-sub:19
1354 PROPS-END
1355
1356
1357 Node-path: branches/left/wham_eth
1358 Node-kind: file
1359 Node-action: add
1360 Node-copyfrom-rev: 19
1361 Node-copyfrom-path: branches/left-sub/wham_eth
1362 Text-copy-source-md5: 757bcd5818572ef3f9580052617c1c8b
1363 Text-copy-source-sha1: b165019b005c199237ba822c4404e771e93b654a
1364
1365
1366 Revision-number: 22
1367 Prop-content-length: 134
1368 Content-length: 134
1369
1370 K 7
1371 svn:log
1372 V 35
1373 (r22) Merge left sub-branch to left
1374 K 10
1375 svn:author
1376 V 4
1377 samv
1378 K 8
1379 svn:date
1380 V 27
1381 2009-12-19T16:18:01.679218Z
1382 PROPS-END
1383
1384 Node-path: branches/left
1385 Node-kind: dir
1386 Node-action: change
1387 Prop-content-length: 79
1388 Content-length: 79
1389
1390 K 13
1391 svn:mergeinfo
1392 V 44
1393 /branches/left-sub:4-19
1394 /branches/right:2-17
1395 PROPS-END
1396
1397
1398 Node-path: branches/left/Makefile
1399 Node-kind: file
1400 Node-action: change
1401 Text-content-length: 2713
1402 Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
1403 Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14
1404 Content-length: 2713
1405
1406 # -DCOLLISION_CHECK if you believe that SHA1's
1407 # 1461501637330902918203684832716283019655932542976 hashes do not give you
1408 # enough guarantees about no collisions between objects ever hapenning.
1409 #
1410 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
1411 # Note that you need some new glibc (at least >2.2.4) for this, and it will
1412 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
1413 # break unless your underlying filesystem supports those sub-second times
1414 # (my ext3 doesn't).
1415 CFLAGS=-g -O3 -Wall
1416
1417 CC=gcc
1418
1419
1420 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
1421         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
1422         check-files ls-tree merge-base merge-cache
1423
1424 all: $(PROG)
1425
1426 install: $(PROG)
1427         install $(PROG) $(HOME)/bin/
1428
1429 LIBS= -lssl -lz
1430
1431 init-db: init-db.o
1432
1433 update-cache: update-cache.o read-cache.o
1434         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
1435
1436 show-diff: show-diff.o read-cache.o
1437         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
1438
1439 write-tree: write-tree.o read-cache.o
1440         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
1441
1442 read-tree: read-tree.o read-cache.o
1443         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
1444
1445 commit-tree: commit-tree.o read-cache.o
1446         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
1447
1448 cat-file: cat-file.o read-cache.o
1449         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
1450
1451 fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
1452         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1453
1454 checkout-cache: checkout-cache.o read-cache.o
1455         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
1456
1457 diff-tree: diff-tree.o read-cache.o
1458         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
1459
1460 rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
1461         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1462
1463 show-files: show-files.o read-cache.o
1464         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
1465
1466 check-files: check-files.o read-cache.o
1467         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
1468
1469 ls-tree: ls-tree.o read-cache.o
1470         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
1471
1472 merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
1473         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
1474
1475 merge-cache: merge-cache.o read-cache.o
1476         $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
1477
1478 read-cache.o: cache.h
1479 show-diff.o: cache.h
1480
1481 clean:
1482         rm -f *.o $(PROG)
1483
1484 backup: clean
1485         cd .. ; tar czvf dircache.tar.gz dir-cache
1486
1487
1488 Node-path: branches/left/README
1489 Node-kind: file
1490 Node-action: add
1491 Node-copyfrom-rev: 18
1492 Node-copyfrom-path: branches/left-sub/README
1493 Text-copy-source-md5: fdbcfb6be9afe1121862143f226b51cf
1494 Text-copy-source-sha1: 1d1f5ea4ceb584337ffe59b8980d92e3b78dfef4
1495
1496
1497 Node-path: branches/left/bang
1498 Node-kind: file
1499 Node-action: add
1500 Node-copyfrom-rev: 18
1501 Node-copyfrom-path: branches/left-sub/bang
1502 Text-copy-source-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
1503 Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
1504
1505
1506 Node-path: branches/left/urkkk
1507 Node-kind: file
1508 Node-action: add
1509 Node-copyfrom-rev: 18
1510 Node-copyfrom-path: branches/left-sub/urkkk
1511 Text-copy-source-md5: 5889c8392e16251b0c80927607a03036
1512 Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1513
1514
1515 Revision-number: 23
1516 Prop-content-length: 126
1517 Content-length: 126
1518
1519 K 7
1520 svn:log
1521 V 27
1522 (r23) Merge left to trunk 2
1523 K 10
1524 svn:author
1525 V 4
1526 samv
1527 K 8
1528 svn:date
1529 V 27
1530 2009-12-19T16:18:02.212349Z
1531 PROPS-END
1532
1533 Node-path: trunk
1534 Node-kind: dir
1535 Node-action: change
1536 Prop-content-length: 99
1537 Content-length: 99
1538
1539 K 13
1540 svn:mergeinfo
1541 V 64
1542 /branches/left:2-22
1543 /branches/left-sub:4-19
1544 /branches/right:2-17
1545 PROPS-END
1546
1547
1548 Node-path: trunk/README
1549 Node-kind: file
1550 Node-action: add
1551 Node-copyfrom-rev: 22
1552 Node-copyfrom-path: branches/left/README
1553 Text-copy-source-md5: fdbcfb6be9afe1121862143f226b51cf
1554 Text-copy-source-sha1: 1d1f5ea4ceb584337ffe59b8980d92e3b78dfef4
1555
1556
1557 Node-path: trunk/glurpp
1558 Node-kind: file
1559 Node-action: add
1560 Node-copyfrom-rev: 22
1561 Node-copyfrom-path: branches/left/glurpp
1562 Text-copy-source-md5: 14a169f628e0bb59df9c2160649d0a30
1563 Text-copy-source-sha1: ef7d929e52177767ecfcd28941f6b7f04b4131e3
1564
1565
1566 Node-path: trunk/urkkk
1567 Node-kind: file
1568 Node-action: add
1569 Node-copyfrom-rev: 22
1570 Node-copyfrom-path: branches/left/urkkk
1571 Text-copy-source-md5: 5889c8392e16251b0c80927607a03036
1572 Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1573
1574
1575 Node-path: trunk/wham_eth
1576 Node-kind: file
1577 Node-action: add
1578 Node-copyfrom-rev: 22
1579 Node-copyfrom-path: branches/left/wham_eth
1580 Text-copy-source-md5: 757bcd5818572ef3f9580052617c1c8b
1581 Text-copy-source-sha1: b165019b005c199237ba822c4404e771e93b654a
1582
1583
1584 Node-path: trunk/zlonk
1585 Node-kind: file
1586 Node-action: add
1587 Node-copyfrom-rev: 22
1588 Node-copyfrom-path: branches/left/zlonk
1589 Text-copy-source-md5: 8b9d8c7c2aaa6167e7d3407a773bbbba
1590 Text-copy-source-sha1: 9716527ebd70a75c27625cacbeb2d897c6e86178
1591
1592
1593 Revision-number: 24
1594 Prop-content-length: 131
1595 Content-length: 131
1596
1597 K 7
1598 svn:log
1599 V 32
1600 (r24) non-merge right to trunk 2
1601 K 10
1602 svn:author
1603 V 4
1604 samv
1605 K 8
1606 svn:date
1607 V 27
1608 2009-12-19T16:18:02.672148Z
1609 PROPS-END
1610
1611 Node-path: trunk
1612 Node-kind: dir
1613 Node-action: change
1614 Prop-content-length: 99
1615 Content-length: 99
1616
1617 K 13
1618 svn:mergeinfo
1619 V 64
1620 /branches/left:2-22
1621 /branches/left-sub:4-19
1622 /branches/right:2-22
1623 PROPS-END
1624
1625