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

   1 SVN-fs-dump-format-version: 2
   2
   3 UUID: d6191530-2693-4a8e-98e7-b194d4c3edd8
   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 2010-01-19T04:14:02.832406Z
  13 PROPS-END
  14
  15 Revision-number: 1
  16 Prop-content-length: 134
  17 Content-length: 134
  18
  19 K 7
  20 svn:log
  21 V 36
  22 (r1) Setup trunk, branches, and tags
  23 K 10
  24 svn:author
  25 V 3
  26 adm
  27 K 8
  28 svn:date
  29 V 27
  30 2010-01-19T04:14:03.055172Z
  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: tags
  43 Node-kind: dir
  44 Node-action: add
  45 Prop-content-length: 10
  46 Content-length: 10
  47
  48 PROPS-END
  49
  50
  51 Node-path: trunk
  52 Node-kind: dir
  53 Node-action: add
  54 Prop-content-length: 10
  55 Content-length: 10
  56
  57 PROPS-END
  58
  59
  60 Revision-number: 2
  61 Prop-content-length: 111
  62 Content-length: 111
  63
  64 K 7
  65 svn:log
  66 V 13
  67 (r2) ancestor
  68 K 10
  69 svn:author
  70 V 3
  71 adm
  72 K 8
  73 svn:date
  74 V 27
  75 2010-01-19T04:14:04.064506Z
  76 PROPS-END
  77
  78 Node-path: trunk/Makefile
  79 Node-kind: file
  80 Node-action: add
  81 Prop-content-length: 10
  82 Text-content-length: 2401
  83 Text-content-md5: bfd8ff778d1492dc6758567373176a89
  84 Text-content-sha1: 103205ce331f7d64086dba497574734f78439590
  85 Content-length: 2411
  86
  87 PROPS-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).
  97 CFLAGS=-g -O3 -Wall
  98
  99 CC=gcc
 100
 101
 102 PROG=   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
 106 all: $(PROG)
 107
 108 install: $(PROG)
 109         install $(PROG) $(HOME)/bin/
 110
 111 LIBS= -lssl -lz
 112
 113 init-db: init-db.o
 114
 115 update-cache: update-cache.o read-cache.o
 116         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 117
 118 show-diff: show-diff.o read-cache.o
 119         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 120
 121 write-tree: write-tree.o read-cache.o
 122         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 123
 124 read-tree: read-tree.o read-cache.o
 125         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 126
 127 commit-tree: commit-tree.o read-cache.o
 128         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 129
 130 cat-file: cat-file.o read-cache.o
 131         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 132
 133 fsck-cache: fsck-cache.o read-cache.o
 134         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
 135
 136 checkout-cache: checkout-cache.o read-cache.o
 137         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 138
 139 diff-tree: diff-tree.o read-cache.o
 140         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 141
 142 rev-tree: rev-tree.o read-cache.o
 143         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
 144
 145 show-files: show-files.o read-cache.o
 146         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 147
 148 check-files: check-files.o read-cache.o
 149         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 150
 151 ls-tree: ls-tree.o read-cache.o
 152         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 153
 154 merge-base: merge-base.o read-cache.o
 155         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 156
 157 read-cache.o: cache.h
 158 show-diff.o: cache.h
 159
 160 clean:
 161         rm -f *.o $(PROG)
 162
 163 backup: clean
 164         cd .. ; tar czvf dircache.tar.gz dir-cache
 165
 166
 167 Revision-number: 3
 168 Prop-content-length: 119
 169 Content-length: 119
 170
 171 K 7
 172 svn:log
 173 V 21
 174 (r3) make left branch
 175 K 10
 176 svn:author
 177 V 3
 178 adm
 179 K 8
 180 svn:date
 181 V 27
 182 2010-01-19T04:14:06.040389Z
 183 PROPS-END
 184
 185 Node-path: branches/left
 186 Node-kind: dir
 187 Node-action: add
 188 Node-copyfrom-rev: 1
 189 Node-copyfrom-path: trunk
 190
 191
 192 Node-path: branches/left/Makefile
 193 Node-kind: file
 194 Node-action: add
 195 Node-copyfrom-rev: 2
 196 Node-copyfrom-path: trunk/Makefile
 197 Text-copy-source-md5: bfd8ff778d1492dc6758567373176a89
 198 Text-copy-source-sha1: 103205ce331f7d64086dba497574734f78439590
 199
 200
 201 Revision-number: 4
 202 Prop-content-length: 120
 203 Content-length: 120
 204
 205 K 7
 206 svn:log
 207 V 22
 208 (r4) make right branch
 209 K 10
 210 svn:author
 211 V 3
 212 adm
 213 K 8
 214 svn:date
 215 V 27
 216 2010-01-19T04:14:08.040905Z
 217 PROPS-END
 218
 219 Node-path: branches/right
 220 Node-kind: dir
 221 Node-action: add
 222 Node-copyfrom-rev: 1
 223 Node-copyfrom-path: trunk
 224
 225
 226 Node-path: branches/right/Makefile
 227 Node-kind: file
 228 Node-action: add
 229 Node-copyfrom-rev: 2
 230 Node-copyfrom-path: trunk/Makefile
 231 Text-copy-source-md5: bfd8ff778d1492dc6758567373176a89
 232 Text-copy-source-sha1: 103205ce331f7d64086dba497574734f78439590
 233
 234
 235 Revision-number: 5
 236 Prop-content-length: 116
 237 Content-length: 116
 238
 239 K 7
 240 svn:log
 241 V 18
 242 (r5) left update 1
 243 K 10
 244 svn:author
 245 V 3
 246 adm
 247 K 8
 248 svn:date
 249 V 27
 250 2010-01-19T04:14:09.049169Z
 251 PROPS-END
 252
 253 Node-path: branches/left/Makefile
 254 Node-kind: file
 255 Node-action: change
 256 Text-content-length: 2465
 257 Text-content-md5: 16e38d9753b061731650561ce01b1195
 258 Text-content-sha1: 36da4b84ea9b64218ab48171dfc5c48ae025f38b
 259 Content-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).
 270 CFLAGS=-g -O3 -Wall
 271
 272 CC=gcc
 273
 274
 275 PROG=   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
 279 all: $(PROG)
 280
 281 install: $(PROG)
 282         install $(PROG) $(HOME)/bin/
 283
 284 LIBS= -lssl -lz
 285
 286 init-db: init-db.o
 287
 288 update-cache: update-cache.o read-cache.o
 289         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 290
 291 show-diff: show-diff.o read-cache.o
 292         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 293
 294 write-tree: write-tree.o read-cache.o
 295         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 296
 297 read-tree: read-tree.o read-cache.o
 298         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 299
 300 commit-tree: commit-tree.o read-cache.o
 301         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 302
 303 cat-file: cat-file.o read-cache.o
 304         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 305
 306 fsck-cache: fsck-cache.o read-cache.o
 307         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
 308
 309 checkout-cache: checkout-cache.o read-cache.o
 310         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 311
 312 diff-tree: diff-tree.o read-cache.o
 313         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 314
 315 rev-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
 318 show-files: show-files.o read-cache.o
 319         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 320
 321 check-files: check-files.o read-cache.o
 322         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 323
 324 ls-tree: ls-tree.o read-cache.o
 325         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 326
 327 merge-base: merge-base.o read-cache.o
 328         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 329
 330 read-cache.o: cache.h
 331 show-diff.o: cache.h
 332
 333 clean:
 334         rm -f *.o $(PROG)
 335
 336 backup: clean
 337         cd .. ; tar czvf dircache.tar.gz dir-cache
 338
 339
 340 Revision-number: 6
 341 Prop-content-length: 117
 342 Content-length: 117
 343
 344 K 7
 345 svn:log
 346 V 19
 347 (r6) right update 1
 348 K 10
 349 svn:author
 350 V 3
 351 adm
 352 K 8
 353 svn:date
 354 V 27
 355 2010-01-19T04:14:10.049350Z
 356 PROPS-END
 357
 358 Node-path: branches/right/Makefile
 359 Node-kind: file
 360 Node-action: change
 361 Text-content-length: 2521
 362 Text-content-md5: 0668418a621333f4aa8b6632cd63e2a0
 363 Text-content-sha1: 4f29afd038e52f45acb5ef8c41acfc70062a741a
 364 Content-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).
 375 CFLAGS=-g -O3 -Wall
 376
 377 CC=gcc
 378
 379
 380 PROG=   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
 384 all: $(PROG)
 385
 386 install: $(PROG)
 387         install $(PROG) $(HOME)/bin/
 388
 389 LIBS= -lssl -lz
 390
 391 init-db: init-db.o
 392
 393 update-cache: update-cache.o read-cache.o
 394         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 395
 396 show-diff: show-diff.o read-cache.o
 397         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 398
 399 write-tree: write-tree.o read-cache.o
 400         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 401
 402 read-tree: read-tree.o read-cache.o
 403         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 404
 405 commit-tree: commit-tree.o read-cache.o
 406         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 407
 408 cat-file: cat-file.o read-cache.o
 409         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 410
 411 fsck-cache: fsck-cache.o read-cache.o
 412         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
 413
 414 checkout-cache: checkout-cache.o read-cache.o
 415         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 416
 417 diff-tree: diff-tree.o read-cache.o
 418         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 419
 420 rev-tree: rev-tree.o read-cache.o
 421         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
 422
 423 show-files: show-files.o read-cache.o
 424         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 425
 426 check-files: check-files.o read-cache.o
 427         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 428
 429 ls-tree: ls-tree.o read-cache.o
 430         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 431
 432 merge-base: merge-base.o read-cache.o
 433         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 434
 435 merge-cache: merge-cache.o read-cache.o
 436         $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
 437
 438 read-cache.o: cache.h
 439 show-diff.o: cache.h
 440
 441 clean:
 442         rm -f *.o $(PROG)
 443
 444 backup: clean
 445         cd .. ; tar czvf dircache.tar.gz dir-cache
 446
 447
 448 Revision-number: 7
 449 Prop-content-length: 116
 450 Content-length: 116
 451
 452 K 7
 453 svn:log
 454 V 18
 455 (r7) left update 2
 456 K 10
 457 svn:author
 458 V 3
 459 adm
 460 K 8
 461 svn:date
 462 V 27
 463 2010-01-19T04:14:11.049209Z
 464 PROPS-END
 465
 466 Node-path: branches/left/Makefile
 467 Node-kind: file
 468 Node-action: change
 469 Text-content-length: 2529
 470 Text-content-md5: f6b197cc3f2e89a83e545d4bb003de73
 471 Text-content-sha1: 2f656677cfec0bceec85e53036ffb63e25126f8e
 472 Content-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).
 483 CFLAGS=-g -O3 -Wall
 484
 485 CC=gcc
 486
 487
 488 PROG=   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
 492 all: $(PROG)
 493
 494 install: $(PROG)
 495         install $(PROG) $(HOME)/bin/
 496
 497 LIBS= -lssl -lz
 498
 499 init-db: init-db.o
 500
 501 update-cache: update-cache.o read-cache.o
 502         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 503
 504 show-diff: show-diff.o read-cache.o
 505         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 506
 507 write-tree: write-tree.o read-cache.o
 508         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 509
 510 read-tree: read-tree.o read-cache.o
 511         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 512
 513 commit-tree: commit-tree.o read-cache.o
 514         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 515
 516 cat-file: cat-file.o read-cache.o
 517         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 518
 519 fsck-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
 522 checkout-cache: checkout-cache.o read-cache.o
 523         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 524
 525 diff-tree: diff-tree.o read-cache.o
 526         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 527
 528 rev-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
 531 show-files: show-files.o read-cache.o
 532         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 533
 534 check-files: check-files.o read-cache.o
 535         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 536
 537 ls-tree: ls-tree.o read-cache.o
 538         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 539
 540 merge-base: merge-base.o read-cache.o
 541         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 542
 543 read-cache.o: cache.h
 544 show-diff.o: cache.h
 545
 546 clean:
 547         rm -f *.o $(PROG)
 548
 549 backup: clean
 550         cd .. ; tar czvf dircache.tar.gz dir-cache
 551
 552
 553 Revision-number: 8
 554 Prop-content-length: 116
 555 Content-length: 116
 556
 557 K 7
 558 svn:log
 559 V 18
 560 (r8) left update 3
 561 K 10
 562 svn:author
 563 V 3
 564 adm
 565 K 8
 566 svn:date
 567 V 27
 568 2010-01-19T04:14:12.049234Z
 569 PROPS-END
 570
 571 Node-path: branches/left/Makefile
 572 Node-kind: file
 573 Node-action: change
 574 Text-content-length: 2593
 575 Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba
 576 Text-content-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
 577 Content-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).
 588 CFLAGS=-g -O3 -Wall
 589
 590 CC=gcc
 591
 592
 593 PROG=   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
 597 all: $(PROG)
 598
 599 install: $(PROG)
 600         install $(PROG) $(HOME)/bin/
 601
 602 LIBS= -lssl -lz
 603
 604 init-db: init-db.o
 605
 606 update-cache: update-cache.o read-cache.o
 607         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 608
 609 show-diff: show-diff.o read-cache.o
 610         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 611
 612 write-tree: write-tree.o read-cache.o
 613         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 614
 615 read-tree: read-tree.o read-cache.o
 616         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 617
 618 commit-tree: commit-tree.o read-cache.o
 619         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 620
 621 cat-file: cat-file.o read-cache.o
 622         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 623
 624 fsck-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
 627 checkout-cache: checkout-cache.o read-cache.o
 628         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 629
 630 diff-tree: diff-tree.o read-cache.o
 631         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 632
 633 rev-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
 636 show-files: show-files.o read-cache.o
 637         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 638
 639 check-files: check-files.o read-cache.o
 640         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 641
 642 ls-tree: ls-tree.o read-cache.o
 643         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 644
 645 merge-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
 648 read-cache.o: cache.h
 649 show-diff.o: cache.h
 650
 651 clean:
 652         rm -f *.o $(PROG)
 653
 654 backup: clean
 655         cd .. ; tar czvf dircache.tar.gz dir-cache
 656
 657
 658 Revision-number: 9
 659 Prop-content-length: 123
 660 Content-length: 123
 661
 662 K 7
 663 svn:log
 664 V 25
 665 (r9) make left sub-branch
 666 K 10
 667 svn:author
 668 V 3
 669 adm
 670 K 8
 671 svn:date
 672 V 27
 673 2010-01-19T04:14:14.040894Z
 674 PROPS-END
 675
 676 Node-path: branches/left-sub
 677 Node-kind: dir
 678 Node-action: add
 679 Node-copyfrom-rev: 3
 680 Node-copyfrom-path: branches/left
 681
 682
 683 Node-path: branches/left-sub/Makefile
 684 Node-kind: file
 685 Node-action: delete
 686
 687 Node-path: branches/left-sub/Makefile
 688 Node-kind: file
 689 Node-action: add
 690 Node-copyfrom-rev: 8
 691 Node-copyfrom-path: branches/left/Makefile
 692 Text-copy-source-md5: 5ccff689fb290e00b85fe18ee50c54ba
 693 Text-copy-source-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
 694
 695
 696
 697
 698 Revision-number: 10
 699 Prop-content-length: 128
 700 Content-length: 128
 701
 702 K 7
 703 svn:log
 704 V 30
 705 (r10) left sub-branch update 1
 706 K 10
 707 svn:author
 708 V 3
 709 adm
 710 K 8
 711 svn:date
 712 V 27
 713 2010-01-19T04:14:15.049935Z
 714 PROPS-END
 715
 716 Node-path: branches/left-sub/README
 717 Node-kind: file
 718 Node-action: add
 719 Prop-content-length: 10
 720 Text-content-length: 7
 721 Text-content-md5: fdbcfb6be9afe1121862143f226b51cf
 722 Text-content-sha1: 1d1f5ea4ceb584337ffe59b8980d92e3b78dfef4
 723 Content-length: 17
 724
 725 PROPS-END
 726 crunch
 727
 728
 729 Revision-number: 11
 730 Prop-content-length: 125
 731 Content-length: 125
 732
 733 K 7
 734 svn:log
 735 V 27
 736 (r11) Merge left to trunk 1
 737 K 10
 738 svn:author
 739 V 3
 740 adm
 741 K 8
 742 svn:date
 743 V 27
 744 2010-01-19T04:14:18.056594Z
 745 PROPS-END
 746
 747 Node-path: trunk
 748 Node-kind: dir
 749 Node-action: change
 750 Prop-content-length: 54
 751 Content-length: 54
 752
 753 K 13
 754 svn:mergeinfo
 755 V 19
 756 /branches/left:2-10
 757 PROPS-END
 758
 759
 760 Node-path: trunk/Makefile
 761 Node-kind: file
 762 Node-action: change
 763 Text-content-length: 2593
 764 Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba
 765 Text-content-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
 766 Content-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).
 777 CFLAGS=-g -O3 -Wall
 778
 779 CC=gcc
 780
 781
 782 PROG=   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
 786 all: $(PROG)
 787
 788 install: $(PROG)
 789         install $(PROG) $(HOME)/bin/
 790
 791 LIBS= -lssl -lz
 792
 793 init-db: init-db.o
 794
 795 update-cache: update-cache.o read-cache.o
 796         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 797
 798 show-diff: show-diff.o read-cache.o
 799         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 800
 801 write-tree: write-tree.o read-cache.o
 802         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 803
 804 read-tree: read-tree.o read-cache.o
 805         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 806
 807 commit-tree: commit-tree.o read-cache.o
 808         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 809
 810 cat-file: cat-file.o read-cache.o
 811         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 812
 813 fsck-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
 816 checkout-cache: checkout-cache.o read-cache.o
 817         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 818
 819 diff-tree: diff-tree.o read-cache.o
 820         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 821
 822 rev-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
 825 show-files: show-files.o read-cache.o
 826         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 827
 828 check-files: check-files.o read-cache.o
 829         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 830
 831 ls-tree: ls-tree.o read-cache.o
 832         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 833
 834 merge-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
 837 read-cache.o: cache.h
 838 show-diff.o: cache.h
 839
 840 clean:
 841         rm -f *.o $(PROG)
 842
 843 backup: clean
 844         cd .. ; tar czvf dircache.tar.gz dir-cache
 845
 846
 847 Revision-number: 12
 848 Prop-content-length: 117
 849 Content-length: 117
 850
 851 K 7
 852 svn:log
 853 V 19
 854 (r12) left update 4
 855 K 10
 856 svn:author
 857 V 3
 858 adm
 859 K 8
 860 svn:date
 861 V 27
 862 2010-01-19T04:14:19.049620Z
 863 PROPS-END
 864
 865 Node-path: branches/left/zlonk
 866 Node-kind: file
 867 Node-action: add
 868 Prop-content-length: 10
 869 Text-content-length: 7
 870 Text-content-md5: 8b9d8c7c2aaa6167e7d3407a773bbbba
 871 Text-content-sha1: 9716527ebd70a75c27625cacbeb2d897c6e86178
 872 Content-length: 17
 873
 874 PROPS-END
 875 touche
 876
 877
 878 Revision-number: 13
 879 Prop-content-length: 118
 880 Content-length: 118
 881
 882 K 7
 883 svn:log
 884 V 20
 885 (r13) right update 2
 886 K 10
 887 svn:author
 888 V 3
 889 adm
 890 K 8
 891 svn:date
 892 V 27
 893 2010-01-19T04:14:20.049659Z
 894 PROPS-END
 895
 896 Node-path: branches/right/bang
 897 Node-kind: file
 898 Node-action: add
 899 Prop-content-length: 10
 900 Text-content-length: 8
 901 Text-content-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
 902 Text-content-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
 903 Content-length: 18
 904
 905 PROPS-END
 906 thwacke
 907
 908
 909 Revision-number: 14
 910 Prop-content-length: 140
 911 Content-length: 140
 912
 913 K 7
 914 svn:log
 915 V 42
 916 (r14) Cherry-pick right 2 commits to trunk
 917 K 10
 918 svn:author
 919 V 3
 920 adm
 921 K 8
 922 svn:date
 923 V 27
 924 2010-01-19T04:14:23.041991Z
 925 PROPS-END
 926
 927 Node-path: trunk
 928 Node-kind: dir
 929 Node-action: change
 930 Prop-content-length: 75
 931 Content-length: 75
 932
 933 K 13
 934 svn:mergeinfo
 935 V 40
 936 /branches/left:2-10
 937 /branches/right:6-13
 938 PROPS-END
 939
 940
 941 Node-path: trunk/Makefile
 942 Node-kind: file
 943 Node-action: change
 944 Text-content-length: 2713
 945 Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
 946 Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14
 947 Content-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).
 958 CFLAGS=-g -O3 -Wall
 959
 960 CC=gcc
 961
 962
 963 PROG=   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
 967 all: $(PROG)
 968
 969 install: $(PROG)
 970         install $(PROG) $(HOME)/bin/
 971
 972 LIBS= -lssl -lz
 973
 974 init-db: init-db.o
 975
 976 update-cache: update-cache.o read-cache.o
 977         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 978
 979 show-diff: show-diff.o read-cache.o
 980         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 981
 982 write-tree: write-tree.o read-cache.o
 983         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 984
 985 read-tree: read-tree.o read-cache.o
 986         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 987
 988 commit-tree: commit-tree.o read-cache.o
 989         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 990
 991 cat-file: cat-file.o read-cache.o
 992         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 993
 994 fsck-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
 997 checkout-cache: checkout-cache.o read-cache.o
 998         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 999
1000 diff-tree: diff-tree.o read-cache.o
1001         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
1002
1003 rev-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
1006 show-files: show-files.o read-cache.o
1007         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
1008
1009 check-files: check-files.o read-cache.o
1010         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
1011
1012 ls-tree: ls-tree.o read-cache.o
1013         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
1014
1015 merge-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
1018 merge-cache: merge-cache.o read-cache.o
1019         $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
1020
1021 read-cache.o: cache.h
1022 show-diff.o: cache.h
1023
1024 clean:
1025         rm -f *.o $(PROG)
1026
1027 backup: clean
1028         cd .. ; tar czvf dircache.tar.gz dir-cache
1029
1030
1031 Node-path: trunk/bang
1032 Node-kind: file
1033 Node-action: add
1034 Node-copyfrom-rev: 13
1035 Node-copyfrom-path: branches/right/bang
1036 Text-copy-source-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
1037 Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
1038
1039
1040 Revision-number: 15
1041 Prop-content-length: 126
1042 Content-length: 126
1043
1044 K 7
1045 svn:log
1046 V 28
1047 (r15) Merge right to trunk 1
1048 K 10
1049 svn:author
1050 V 3
1051 adm
1052 K 8
1053 svn:date
1054 V 27
1055 2010-01-19T04:14:26.054456Z
1056 PROPS-END
1057
1058 Node-path: trunk
1059 Node-kind: dir
1060 Node-action: change
1061 Prop-content-length: 75
1062 Content-length: 75
1063
1064 K 13
1065 svn:mergeinfo
1066 V 40
1067 /branches/left:2-10
1068 /branches/right:2-14
1069 PROPS-END
1070
1071
1072 Revision-number: 16
1073 Prop-content-length: 118
1074 Content-length: 118
1075
1076 K 7
1077 svn:log
1078 V 20
1079 (r16) right update 3
1080 K 10
1081 svn:author
1082 V 3
1083 adm
1084 K 8
1085 svn:date
1086 V 27
1087 2010-01-19T04:14:27.049955Z
1088 PROPS-END
1089
1090 Node-path: branches/right/urkkk
1091 Node-kind: file
1092 Node-action: add
1093 Prop-content-length: 10
1094 Text-content-length: 6
1095 Text-content-md5: 5889c8392e16251b0c80927607a03036
1096 Text-content-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1097 Content-length: 16
1098
1099 PROPS-END
1100 whamm
1101
1102
1103 Revision-number: 17
1104 Prop-content-length: 118
1105 Content-length: 118
1106
1107 K 7
1108 svn:log
1109 V 20
1110 (r17) trunk update 1
1111 K 10
1112 svn:author
1113 V 3
1114 adm
1115 K 8
1116 svn:date
1117 V 27
1118 2010-01-19T04:14:28.049615Z
1119 PROPS-END
1120
1121 Node-path: trunk/vronk
1122 Node-kind: file
1123 Node-action: add
1124 Prop-content-length: 10
1125 Text-content-length: 4
1126 Text-content-md5: b2f80fa02a7f1364b9c29d3da44bf9f9
1127 Text-content-sha1: e994d980c0f2d7a3f76138bf96d57f36f9633828
1128 Content-length: 14
1129
1130 PROPS-END
1131 pow
1132
1133
1134 Revision-number: 18
1135 Prop-content-length: 134
1136 Content-length: 134
1137
1138 K 7
1139 svn:log
1140 V 36
1141 (r18) Merge right to left sub-branch
1142 K 10
1143 svn:author
1144 V 3
1145 adm
1146 K 8
1147 svn:date
1148 V 27
1149 2010-01-19T04:14:31.061460Z
1150 PROPS-END
1151
1152 Node-path: branches/left-sub
1153 Node-kind: dir
1154 Node-action: change
1155 Prop-content-length: 55
1156 Content-length: 55
1157
1158 K 13
1159 svn:mergeinfo
1160 V 20
1161 /branches/right:2-17
1162 PROPS-END
1163
1164
1165 Node-path: branches/left-sub/Makefile
1166 Node-kind: file
1167 Node-action: change
1168 Text-content-length: 2713
1169 Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
1170 Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14
1171 Content-length: 2713
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).
1182 CFLAGS=-g -O3 -Wall
1183
1184 CC=gcc
1185
1186
1187 PROG=   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 \
1189         check-files ls-tree merge-base merge-cache
1190
1191 all: $(PROG)
1192
1193 install: $(PROG)
1194         install $(PROG) $(HOME)/bin/
1195
1196 LIBS= -lssl -lz
1197
1198 init-db: init-db.o
1199
1200 update-cache: update-cache.o read-cache.o
1201         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
1202
1203 show-diff: show-diff.o read-cache.o
1204         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
1205
1206 write-tree: write-tree.o read-cache.o
1207         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
1208
1209 read-tree: read-tree.o read-cache.o
1210         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
1211
1212 commit-tree: commit-tree.o read-cache.o
1213         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
1214
1215 cat-file: cat-file.o read-cache.o
1216         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
1217
1218 fsck-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
1221 checkout-cache: checkout-cache.o read-cache.o
1222         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
1223
1224 diff-tree: diff-tree.o read-cache.o
1225         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
1226
1227 rev-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
1230 show-files: show-files.o read-cache.o
1231         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
1232
1233 check-files: check-files.o read-cache.o
1234         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
1235
1236 ls-tree: ls-tree.o read-cache.o
1237         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
1238
1239 merge-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
1242 merge-cache: merge-cache.o read-cache.o
1243         $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
1244
1245 read-cache.o: cache.h
1246 show-diff.o: cache.h
1247
1248 clean:
1249         rm -f *.o $(PROG)
1250
1251 backup: clean
1252         cd .. ; tar czvf dircache.tar.gz dir-cache
1253
1254
1255 Node-path: branches/left-sub/bang
1256 Node-kind: file
1257 Node-action: add
1258 Node-copyfrom-rev: 17
1259 Node-copyfrom-path: branches/right/bang
1260 Text-copy-source-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
1261 Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
1262
1263
1264 Node-path: branches/left-sub/urkkk
1265 Node-kind: file
1266 Node-action: add
1267 Node-copyfrom-rev: 17
1268 Node-copyfrom-path: branches/right/urkkk
1269 Text-copy-source-md5: 5889c8392e16251b0c80927607a03036
1270 Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1271
1272
1273 Revision-number: 19
1274 Prop-content-length: 128
1275 Content-length: 128
1276
1277 K 7
1278 svn:log
1279 V 30
1280 (r19) left sub-branch update 2
1281 K 10
1282 svn:author
1283 V 3
1284 adm
1285 K 8
1286 svn:date
1287 V 27
1288 2010-01-19T04:14:32.049244Z
1289 PROPS-END
1290
1291 Node-path: branches/left-sub/wham_eth
1292 Node-kind: file
1293 Node-action: add
1294 Prop-content-length: 10
1295 Text-content-length: 6
1296 Text-content-md5: 757bcd5818572ef3f9580052617c1c8b
1297 Text-content-sha1: b165019b005c199237ba822c4404e771e93b654a
1298 Content-length: 16
1299
1300 PROPS-END
1301 zowie
1302
1303
1304 Revision-number: 20
1305 Prop-content-length: 117
1306 Content-length: 117
1307
1308 K 7
1309 svn:log
1310 V 19
1311 (r20) left update 5
1312 K 10
1313 svn:author
1314 V 3
1315 adm
1316 K 8
1317 svn:date
1318 V 27
1319 2010-01-19T04:14:33.049332Z
1320 PROPS-END
1321
1322 Node-path: branches/left/glurpp
1323 Node-kind: file
1324 Node-action: add
1325 Prop-content-length: 10
1326 Text-content-length: 8
1327 Text-content-md5: 14a169f628e0bb59df9c2160649d0a30
1328 Text-content-sha1: ef7d929e52177767ecfcd28941f6b7f04b4131e3
1329 Content-length: 18
1330
1331 PROPS-END
1332 eee_yow
1333
1334
1335 Revision-number: 21
1336 Prop-content-length: 146
1337 Content-length: 146
1338
1339 K 7
1340 svn:log
1341 V 48
1342 (r21) Cherry-pick left sub-branch commit to left
1343 K 10
1344 svn:author
1345 V 3
1346 adm
1347 K 8
1348 svn:date
1349 V 27
1350 2010-01-19T04:14:36.041839Z
1351 PROPS-END
1352
1353 Node-path: branches/left
1354 Node-kind: dir
1355 Node-action: change
1356 Prop-content-length: 56
1357 Content-length: 56
1358
1359 K 13
1360 svn:mergeinfo
1361 V 21
1362 /branches/left-sub:19
1363 PROPS-END
1364
1365
1366 Node-path: branches/left/wham_eth
1367 Node-kind: file
1368 Node-action: add
1369 Node-copyfrom-rev: 19
1370 Node-copyfrom-path: branches/left-sub/wham_eth
1371 Text-copy-source-md5: 757bcd5818572ef3f9580052617c1c8b
1372 Text-copy-source-sha1: b165019b005c199237ba822c4404e771e93b654a
1373
1374
1375 Revision-number: 22
1376 Prop-content-length: 133
1377 Content-length: 133
1378
1379 K 7
1380 svn:log
1381 V 35
1382 (r22) Merge left sub-branch to left
1383 K 10
1384 svn:author
1385 V 3
1386 adm
1387 K 8
1388 svn:date
1389 V 27
1390 2010-01-19T04:14:39.045014Z
1391 PROPS-END
1392
1393 Node-path: branches/left
1394 Node-kind: dir
1395 Node-action: change
1396 Prop-content-length: 79
1397 Content-length: 79
1398
1399 K 13
1400 svn:mergeinfo
1401 V 44
1402 /branches/left-sub:4-19
1403 /branches/right:2-17
1404 PROPS-END
1405
1406
1407 Node-path: branches/left/Makefile
1408 Node-kind: file
1409 Node-action: change
1410 Text-content-length: 2713
1411 Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
1412 Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14
1413 Content-length: 2713
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).
1424 CFLAGS=-g -O3 -Wall
1425
1426 CC=gcc
1427
1428
1429 PROG=   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 \
1431         check-files ls-tree merge-base merge-cache
1432
1433 all: $(PROG)
1434
1435 install: $(PROG)
1436         install $(PROG) $(HOME)/bin/
1437
1438 LIBS= -lssl -lz
1439
1440 init-db: init-db.o
1441
1442 update-cache: update-cache.o read-cache.o
1443         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
1444
1445 show-diff: show-diff.o read-cache.o
1446         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
1447
1448 write-tree: write-tree.o read-cache.o
1449         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
1450
1451 read-tree: read-tree.o read-cache.o
1452         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
1453
1454 commit-tree: commit-tree.o read-cache.o
1455         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
1456
1457 cat-file: cat-file.o read-cache.o
1458         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
1459
1460 fsck-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
1463 checkout-cache: checkout-cache.o read-cache.o
1464         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
1465
1466 diff-tree: diff-tree.o read-cache.o
1467         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
1468
1469 rev-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
1472 show-files: show-files.o read-cache.o
1473         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
1474
1475 check-files: check-files.o read-cache.o
1476         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
1477
1478 ls-tree: ls-tree.o read-cache.o
1479         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
1480
1481 merge-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
1484 merge-cache: merge-cache.o read-cache.o
1485         $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
1486
1487 read-cache.o: cache.h
1488 show-diff.o: cache.h
1489
1490 clean:
1491         rm -f *.o $(PROG)
1492
1493 backup: clean
1494         cd .. ; tar czvf dircache.tar.gz dir-cache
1495
1496
1497 Node-path: branches/left/README
1498 Node-kind: file
1499 Node-action: add
1500 Node-copyfrom-rev: 18
1501 Node-copyfrom-path: branches/left-sub/README
1502 Text-copy-source-md5: fdbcfb6be9afe1121862143f226b51cf
1503 Text-copy-source-sha1: 1d1f5ea4ceb584337ffe59b8980d92e3b78dfef4
1504
1505
1506 Node-path: branches/left/bang
1507 Node-kind: file
1508 Node-action: add
1509 Node-copyfrom-rev: 18
1510 Node-copyfrom-path: branches/left-sub/bang
1511 Text-copy-source-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
1512 Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
1513
1514
1515 Node-path: branches/left/urkkk
1516 Node-kind: file
1517 Node-action: add
1518 Node-copyfrom-rev: 18
1519 Node-copyfrom-path: branches/left-sub/urkkk
1520 Text-copy-source-md5: 5889c8392e16251b0c80927607a03036
1521 Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1522
1523
1524 Revision-number: 23
1525 Prop-content-length: 125
1526 Content-length: 125
1527
1528 K 7
1529 svn:log
1530 V 27
1531 (r23) Merge left to trunk 2
1532 K 10
1533 svn:author
1534 V 3
1535 adm
1536 K 8
1537 svn:date
1538 V 27
1539 2010-01-19T04:14:42.052798Z
1540 PROPS-END
1541
1542 Node-path: trunk
1543 Node-kind: dir
1544 Node-action: change
1545 Prop-content-length: 99
1546 Content-length: 99
1547
1548 K 13
1549 svn:mergeinfo
1550 V 64
1551 /branches/left:2-22
1552 /branches/left-sub:4-19
1553 /branches/right:2-17
1554 PROPS-END
1555
1556
1557 Node-path: trunk/README
1558 Node-kind: file
1559 Node-action: add
1560 Node-copyfrom-rev: 22
1561 Node-copyfrom-path: branches/left/README
1562 Text-copy-source-md5: fdbcfb6be9afe1121862143f226b51cf
1563 Text-copy-source-sha1: 1d1f5ea4ceb584337ffe59b8980d92e3b78dfef4
1564
1565
1566 Node-path: trunk/glurpp
1567 Node-kind: file
1568 Node-action: add
1569 Node-copyfrom-rev: 22
1570 Node-copyfrom-path: branches/left/glurpp
1571 Text-copy-source-md5: 14a169f628e0bb59df9c2160649d0a30
1572 Text-copy-source-sha1: ef7d929e52177767ecfcd28941f6b7f04b4131e3
1573
1574
1575 Node-path: trunk/urkkk
1576 Node-kind: file
1577 Node-action: add
1578 Node-copyfrom-rev: 22
1579 Node-copyfrom-path: branches/left/urkkk
1580 Text-copy-source-md5: 5889c8392e16251b0c80927607a03036
1581 Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
1582
1583
1584 Node-path: trunk/wham_eth
1585 Node-kind: file
1586 Node-action: add
1587 Node-copyfrom-rev: 22
1588 Node-copyfrom-path: branches/left/wham_eth
1589 Text-copy-source-md5: 757bcd5818572ef3f9580052617c1c8b
1590 Text-copy-source-sha1: b165019b005c199237ba822c4404e771e93b654a
1591
1592
1593 Node-path: trunk/zlonk
1594 Node-kind: file
1595 Node-action: add
1596 Node-copyfrom-rev: 22
1597 Node-copyfrom-path: branches/left/zlonk
1598 Text-copy-source-md5: 8b9d8c7c2aaa6167e7d3407a773bbbba
1599 Text-copy-source-sha1: 9716527ebd70a75c27625cacbeb2d897c6e86178
1600
1601
1602 Revision-number: 24
1603 Prop-content-length: 130
1604 Content-length: 130
1605
1606 K 7
1607 svn:log
1608 V 32
1609 (r24) non-merge right to trunk 2
1610 K 10
1611 svn:author
1612 V 3
1613 adm
1614 K 8
1615 svn:date
1616 V 27
1617 2010-01-19T04:14:44.038434Z
1618 PROPS-END
1619
1620 Node-path: trunk
1621 Node-kind: dir
1622 Node-action: change
1623 Prop-content-length: 99
1624 Content-length: 99
1625
1626 K 13
1627 svn:mergeinfo
1628 V 64
1629 /branches/left:2-22
1630 /branches/left-sub:4-19
1631 /branches/right:2-22
1632 PROPS-END
1633
1634
1635 Revision-number: 25
1636 Prop-content-length: 135
1637 Content-length: 135
1638
1639 K 7
1640 svn:log
1641 V 37
1642 (r25) add subdirectory to left branch
1643 K 10
1644 svn:author
1645 V 3
1646 adm
1647 K 8
1648 svn:date
1649 V 27
1650 2010-01-19T04:14:46.052649Z
1651 PROPS-END
1652
1653 Node-path: branches/left/subdir
1654 Node-kind: dir
1655 Node-action: add
1656 Prop-content-length: 10
1657 Content-length: 10
1658
1659 PROPS-END
1660
1661
1662 Node-path: branches/left/subdir/cowboy
1663 Node-kind: file
1664 Node-action: add
1665 Prop-content-length: 10
1666 Text-content-length: 7
1667 Text-content-md5: f1d6530278ad409e68cc675476ad995f
1668 Text-content-sha1: 732d9e3e5c391ffd767a98b45ddcc848de778cea
1669 Content-length: 17
1670
1671 PROPS-END
1672 Yeehaw
1673
1674
1675 Revision-number: 26
1676 Prop-content-length: 123
1677 Content-length: 123
1678
1679 K 7
1680 svn:log
1681 V 25
1682 (r26) merge left to trunk
1683 K 10
1684 svn:author
1685 V 3
1686 adm
1687 K 8
1688 svn:date
1689 V 27
1690 2010-01-19T04:14:49.040783Z
1691 PROPS-END
1692
1693 Node-path: trunk
1694 Node-kind: dir
1695 Node-action: change
1696 Prop-content-length: 99
1697 Content-length: 99
1698
1699 K 13
1700 svn:mergeinfo
1701 V 64
1702 /branches/left:2-25
1703 /branches/left-sub:4-19
1704 /branches/right:2-22
1705 PROPS-END
1706
1707
1708 Node-path: trunk/subdir
1709 Node-kind: dir
1710 Node-action: add
1711 Node-copyfrom-rev: 25
1712 Node-copyfrom-path: branches/left/subdir
1713
1714
1715 Revision-number: 27
1716 Prop-content-length: 118
1717 Content-length: 118
1718
1719 K 7
1720 svn:log
1721 V 20
1722 (r28) partial update
1723 K 10
1724 svn:author
1725 V 3
1726 adm
1727 K 8
1728 svn:date
1729 V 27
1730 2010-01-19T04:14:53.049037Z
1731 PROPS-END
1732
1733 Node-path: branches/partial
1734 Node-kind: dir
1735 Node-action: add
1736 Node-copyfrom-rev: 26
1737 Node-copyfrom-path: trunk/subdir
1738
1739
1740 Node-path: branches/partial/palindromes
1741 Node-kind: file
1742 Node-action: add
1743 Prop-content-length: 10
1744 Text-content-length: 8
1745 Text-content-md5: 5d1c2024fb5efc4eef812856df1b080c
1746 Text-content-sha1: 5f8509ddd14c91a52864dd1447344e706f9bbc69
1747 Content-length: 18
1748
1749 PROPS-END
1750 racecar
1751
1752
1753 Revision-number: 28
1754 Prop-content-length: 126
1755 Content-length: 126
1756
1757 K 7
1758 svn:log
1759 V 28
1760 (r29) merge partial to trunk
1761 K 10
1762 svn:author
1763 V 3
1764 adm
1765 K 8
1766 svn:date
1767 V 27
1768 2010-01-19T04:14:56.041526Z
1769 PROPS-END
1770
1771 Node-path: trunk/subdir
1772 Node-kind: dir
1773 Node-action: change
1774 Prop-content-length: 142
1775 Content-length: 142
1776
1777 K 13
1778 svn:mergeinfo
1779 V 106
1780 /branches/left/subdir:2-25
1781 /branches/left-sub/subdir:4-19
1782 /branches/partial:27
1783 /branches/right/subdir:2-22
1784 PROPS-END
1785
1786
1787 Node-path: trunk/subdir/palindromes
1788 Node-kind: file
1789 Node-action: add
1790 Node-copyfrom-rev: 27
1791 Node-copyfrom-path: branches/partial/palindromes
1792 Text-copy-source-md5: 5d1c2024fb5efc4eef812856df1b080c
1793 Text-copy-source-sha1: 5f8509ddd14c91a52864dd1447344e706f9bbc69
1794
1795
1796 Revision-number: 29
1797 Prop-content-length: 131
1798 Content-length: 131
1799
1800 K 7
1801 svn:log
1802 V 33
1803 (r31) make bugfix branch from tag
1804 K 10
1805 svn:author
1806 V 3
1807 adm
1808 K 8
1809 svn:date
1810 V 27
1811 2010-01-19T04:15:00.039761Z
1812 PROPS-END
1813
1814 Node-path: tags/v1.0
1815 Node-kind: dir
1816 Node-action: add
1817 Node-copyfrom-rev: 28
1818 Node-copyfrom-path: trunk
1819
1820
1821 Revision-number: 30
1822 Prop-content-length: 120
1823 Content-length: 120
1824
1825 K 7
1826 svn:log
1827 V 22
1828 (r32) commit to bugfix
1829 K 10
1830 svn:author
1831 V 3
1832 adm
1833 K 8
1834 svn:date
1835 V 27
1836 2010-01-19T04:15:03.043218Z
1837 PROPS-END
1838
1839 Node-path: branches/bugfix
1840 Node-kind: dir
1841 Node-action: add
1842 Node-copyfrom-rev: 29
1843 Node-copyfrom-path: tags/v1.0
1844
1845
1846 Node-path: branches/bugfix/subdir/palindromes
1847 Node-kind: file
1848 Node-action: change
1849 Text-content-length: 14
1850 Text-content-md5: 3b12d98578a3f4320ba97e66da54fe5f
1851 Text-content-sha1: 672931c9e8ac2c408209efab2f015638b6d64042
1852 Content-length: 14
1853
1854 racecar
1855 kayak
1856
1857
1858 Revision-number: 31
1859 Prop-content-length: 125
1860 Content-length: 125
1861
1862 K 7
1863 svn:log
1864 V 27
1865 (r33) Merge BUGFIX to TRUNK
1866 K 10
1867 svn:author
1868 V 3
1869 adm
1870 K 8
1871 svn:date
1872 V 27
1873 2010-01-19T04:15:06.043723Z
1874 PROPS-END
1875
1876 Node-path: trunk
1877 Node-kind: dir
1878 Node-action: change
1879 Prop-content-length: 133
1880 Content-length: 133
1881
1882 K 13
1883 svn:mergeinfo
1884 V 98
1885 /branches/bugfix:30
1886 /branches/left:2-25
1887 /branches/left-sub:4-19
1888 /branches/right:2-22
1889 /tags/v1.0:29
1890 PROPS-END
1891
1892
1893 Node-path: trunk/subdir
1894 Node-kind: dir
1895 Node-action: change
1896 Prop-content-length: 190
1897 Content-length: 190
1898
1899 K 13
1900 svn:mergeinfo
1901 V 154
1902 /branches/bugfix/subdir:30
1903 /branches/left/subdir:2-25
1904 /branches/left-sub/subdir:4-19
1905 /branches/partial:27
1906 /branches/right/subdir:2-22
1907 /tags/v1.0/subdir:29
1908 PROPS-END
1909
1910
1911 Node-path: trunk/subdir/palindromes
1912 Node-kind: file
1913 Node-action: change
1914 Text-content-length: 14
1915 Text-content-md5: 3b12d98578a3f4320ba97e66da54fe5f
1916 Text-content-sha1: 672931c9e8ac2c408209efab2f015638b6d64042
1917 Content-length: 14
1918
1919 racecar
1920 kayak
1921
1922