t/t9150/svk-merge.dump

   1 SVN-fs-dump-format-version: 2
   2
   3 UUID: b48289b2-9c08-4d72-af37-0358a40b9c15
   4
   5 Revision-number: 0
   6 Prop-content-length: 56
   7 Content-length: 56
   8
   9 K 8
  10 svn:date
  11 V 27
  12 2009-10-19T23:44:03.722969Z
  13 PROPS-END
  14
  15 Revision-number: 1
  16 Prop-content-length: 123
  17 Content-length: 123
  18
  19 K 7
  20 svn:log
  21 V 24
  22 Setup trunk and branches
  23 K 10
  24 svn:author
  25 V 4
  26 samv
  27 K 8
  28 svn:date
  29 V 27
  30 2009-10-19T23:44:04.927533Z
  31 PROPS-END
  32
  33 Node-path: branches
  34 Node-kind: dir
  35 Node-action: add
  36 Prop-content-length: 10
  37 Content-length: 10
  38
  39 PROPS-END
  40
  41
  42 Node-path: trunk
  43 Node-kind: dir
  44 Node-action: add
  45 Prop-content-length: 10
  46 Content-length: 10
  47
  48 PROPS-END
  49
  50
  51 Revision-number: 2
  52 Prop-content-length: 106
  53 Content-length: 106
  54
  55 K 7
  56 svn:log
  57 V 8
  58 ancestor
  59 K 10
  60 svn:author
  61 V 4
  62 samv
  63 K 8
  64 svn:date
  65 V 27
  66 2009-10-19T23:44:05.835585Z
  67 PROPS-END
  68
  69 Node-path: trunk/Makefile
  70 Node-kind: file
  71 Node-action: add
  72 Prop-content-length: 10
  73 Text-content-length: 2401
  74 Text-content-md5: bfd8ff778d1492dc6758567373176a89
  75 Content-length: 2411
  76
  77 PROPS-END
  78 # -DCOLLISION_CHECK if you believe that SHA1's
  79 # 1461501637330902918203684832716283019655932542976 hashes do not give you
  80 # enough guarantees about no collisions between objects ever hapenning.
  81 #
  82 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
  83 # Note that you need some new glibc (at least >2.2.4) for this, and it will
  84 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
  85 # break unless your underlying filesystem supports those sub-second times
  86 # (my ext3 doesn't).
  87 CFLAGS=-g -O3 -Wall
  88
  89 CC=gcc
  90
  91
  92 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
  93         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
  94         check-files ls-tree merge-base
  95
  96 all: $(PROG)
  97
  98 install: $(PROG)
  99         install $(PROG) $(HOME)/bin/
 100
 101 LIBS= -lssl -lz
 102
 103 init-db: init-db.o
 104
 105 update-cache: update-cache.o read-cache.o
 106         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 107
 108 show-diff: show-diff.o read-cache.o
 109         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 110
 111 write-tree: write-tree.o read-cache.o
 112         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 113
 114 read-tree: read-tree.o read-cache.o
 115         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 116
 117 commit-tree: commit-tree.o read-cache.o
 118         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 119
 120 cat-file: cat-file.o read-cache.o
 121         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 122
 123 fsck-cache: fsck-cache.o read-cache.o
 124         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
 125
 126 checkout-cache: checkout-cache.o read-cache.o
 127         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 128
 129 diff-tree: diff-tree.o read-cache.o
 130         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 131
 132 rev-tree: rev-tree.o read-cache.o
 133         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
 134
 135 show-files: show-files.o read-cache.o
 136         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 137
 138 check-files: check-files.o read-cache.o
 139         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 140
 141 ls-tree: ls-tree.o read-cache.o
 142         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 143
 144 merge-base: merge-base.o read-cache.o
 145         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 146
 147 read-cache.o: cache.h
 148 show-diff.o: cache.h
 149
 150 clean:
 151         rm -f *.o $(PROG)
 152
 153 backup: clean
 154         cd .. ; tar czvf dircache.tar.gz dir-cache
 155
 156
 157 Revision-number: 3
 158 Prop-content-length: 115
 159 Content-length: 115
 160
 161 K 7
 162 svn:log
 163 V 16
 164 make left branch
 165 K 10
 166 svn:author
 167 V 4
 168 samv
 169 K 8
 170 svn:date
 171 V 27
 172 2009-10-19T23:44:06.719737Z
 173 PROPS-END
 174
 175 Node-path: branches/left
 176 Node-kind: dir
 177 Node-action: add
 178 Node-copyfrom-rev: 2
 179 Node-copyfrom-path: trunk
 180
 181
 182 Revision-number: 4
 183 Prop-content-length: 112
 184 Content-length: 112
 185
 186 K 7
 187 svn:log
 188 V 13
 189 left update 1
 190 K 10
 191 svn:author
 192 V 4
 193 samv
 194 K 8
 195 svn:date
 196 V 27
 197 2009-10-19T23:44:07.167666Z
 198 PROPS-END
 199
 200 Node-path: branches/left/Makefile
 201 Node-kind: file
 202 Node-action: change
 203 Text-content-length: 2465
 204 Text-content-md5: 16e38d9753b061731650561ce01b1195
 205 Content-length: 2465
 206
 207 # -DCOLLISION_CHECK if you believe that SHA1's
 208 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 209 # enough guarantees about no collisions between objects ever hapenning.
 210 #
 211 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
 212 # Note that you need some new glibc (at least >2.2.4) for this, and it will
 213 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 214 # break unless your underlying filesystem supports those sub-second times
 215 # (my ext3 doesn't).
 216 CFLAGS=-g -O3 -Wall
 217
 218 CC=gcc
 219
 220
 221 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
 222         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
 223         check-files ls-tree merge-base
 224
 225 all: $(PROG)
 226
 227 install: $(PROG)
 228         install $(PROG) $(HOME)/bin/
 229
 230 LIBS= -lssl -lz
 231
 232 init-db: init-db.o
 233
 234 update-cache: update-cache.o read-cache.o
 235         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 236
 237 show-diff: show-diff.o read-cache.o
 238         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 239
 240 write-tree: write-tree.o read-cache.o
 241         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 242
 243 read-tree: read-tree.o read-cache.o
 244         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 245
 246 commit-tree: commit-tree.o read-cache.o
 247         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 248
 249 cat-file: cat-file.o read-cache.o
 250         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 251
 252 fsck-cache: fsck-cache.o read-cache.o
 253         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
 254
 255 checkout-cache: checkout-cache.o read-cache.o
 256         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 257
 258 diff-tree: diff-tree.o read-cache.o
 259         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 260
 261 rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
 262         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 263
 264 show-files: show-files.o read-cache.o
 265         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 266
 267 check-files: check-files.o read-cache.o
 268         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 269
 270 ls-tree: ls-tree.o read-cache.o
 271         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 272
 273 merge-base: merge-base.o read-cache.o
 274         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 275
 276 read-cache.o: cache.h
 277 show-diff.o: cache.h
 278
 279 clean:
 280         rm -f *.o $(PROG)
 281
 282 backup: clean
 283         cd .. ; tar czvf dircache.tar.gz dir-cache
 284
 285
 286 Revision-number: 5
 287 Prop-content-length: 111
 288 Content-length: 111
 289
 290 K 7
 291 svn:log
 292 V 12
 293 trunk update
 294 K 10
 295 svn:author
 296 V 4
 297 samv
 298 K 8
 299 svn:date
 300 V 27
 301 2009-10-19T23:44:07.619633Z
 302 PROPS-END
 303
 304 Node-path: trunk/Makefile
 305 Node-kind: file
 306 Node-action: change
 307 Text-content-length: 2521
 308 Text-content-md5: 0668418a621333f4aa8b6632cd63e2a0
 309 Content-length: 2521
 310
 311 # -DCOLLISION_CHECK if you believe that SHA1's
 312 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 313 # enough guarantees about no collisions between objects ever hapenning.
 314 #
 315 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
 316 # Note that you need some new glibc (at least >2.2.4) for this, and it will
 317 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 318 # break unless your underlying filesystem supports those sub-second times
 319 # (my ext3 doesn't).
 320 CFLAGS=-g -O3 -Wall
 321
 322 CC=gcc
 323
 324
 325 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
 326         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
 327         check-files ls-tree merge-base merge-cache
 328
 329 all: $(PROG)
 330
 331 install: $(PROG)
 332         install $(PROG) $(HOME)/bin/
 333
 334 LIBS= -lssl -lz
 335
 336 init-db: init-db.o
 337
 338 update-cache: update-cache.o read-cache.o
 339         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 340
 341 show-diff: show-diff.o read-cache.o
 342         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 343
 344 write-tree: write-tree.o read-cache.o
 345         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 346
 347 read-tree: read-tree.o read-cache.o
 348         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 349
 350 commit-tree: commit-tree.o read-cache.o
 351         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 352
 353 cat-file: cat-file.o read-cache.o
 354         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 355
 356 fsck-cache: fsck-cache.o read-cache.o
 357         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
 358
 359 checkout-cache: checkout-cache.o read-cache.o
 360         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 361
 362 diff-tree: diff-tree.o read-cache.o
 363         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 364
 365 rev-tree: rev-tree.o read-cache.o
 366         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
 367
 368 show-files: show-files.o read-cache.o
 369         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 370
 371 check-files: check-files.o read-cache.o
 372         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 373
 374 ls-tree: ls-tree.o read-cache.o
 375         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 376
 377 merge-base: merge-base.o read-cache.o
 378         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 379
 380 merge-cache: merge-cache.o read-cache.o
 381         $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
 382
 383 read-cache.o: cache.h
 384 show-diff.o: cache.h
 385
 386 clean:
 387         rm -f *.o $(PROG)
 388
 389 backup: clean
 390         cd .. ; tar czvf dircache.tar.gz dir-cache
 391
 392
 393 Revision-number: 6
 394 Prop-content-length: 112
 395 Content-length: 112
 396
 397 K 7
 398 svn:log
 399 V 13
 400 left update 2
 401 K 10
 402 svn:author
 403 V 4
 404 samv
 405 K 8
 406 svn:date
 407 V 27
 408 2009-10-19T23:44:08.067554Z
 409 PROPS-END
 410
 411 Node-path: branches/left/Makefile
 412 Node-kind: file
 413 Node-action: change
 414 Text-content-length: 2593
 415 Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba
 416 Content-length: 2593
 417
 418 # -DCOLLISION_CHECK if you believe that SHA1's
 419 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 420 # enough guarantees about no collisions between objects ever hapenning.
 421 #
 422 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
 423 # Note that you need some new glibc (at least >2.2.4) for this, and it will
 424 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 425 # break unless your underlying filesystem supports those sub-second times
 426 # (my ext3 doesn't).
 427 CFLAGS=-g -O3 -Wall
 428
 429 CC=gcc
 430
 431
 432 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
 433         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
 434         check-files ls-tree merge-base
 435
 436 all: $(PROG)
 437
 438 install: $(PROG)
 439         install $(PROG) $(HOME)/bin/
 440
 441 LIBS= -lssl -lz
 442
 443 init-db: init-db.o
 444
 445 update-cache: update-cache.o read-cache.o
 446         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 447
 448 show-diff: show-diff.o read-cache.o
 449         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 450
 451 write-tree: write-tree.o read-cache.o
 452         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 453
 454 read-tree: read-tree.o read-cache.o
 455         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 456
 457 commit-tree: commit-tree.o read-cache.o
 458         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 459
 460 cat-file: cat-file.o read-cache.o
 461         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 462
 463 fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
 464         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 465
 466 checkout-cache: checkout-cache.o read-cache.o
 467         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 468
 469 diff-tree: diff-tree.o read-cache.o
 470         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 471
 472 rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
 473         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 474
 475 show-files: show-files.o read-cache.o
 476         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 477
 478 check-files: check-files.o read-cache.o
 479         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 480
 481 ls-tree: ls-tree.o read-cache.o
 482         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 483
 484 merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
 485         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 486
 487 read-cache.o: cache.h
 488 show-diff.o: cache.h
 489
 490 clean:
 491         rm -f *.o $(PROG)
 492
 493 backup: clean
 494         cd .. ; tar czvf dircache.tar.gz dir-cache
 495
 496
 497 Revision-number: 7
 498 Prop-content-length: 131
 499 Content-length: 131
 500
 501 K 7
 502 svn:log
 503 V 32
 504 merge branch 'left' into 'trunk'
 505 K 10
 506 svn:author
 507 V 4
 508 samv
 509 K 8
 510 svn:date
 511 V 27
 512 2009-10-19T23:44:08.971801Z
 513 PROPS-END
 514
 515 Node-path: trunk
 516 Node-kind: dir
 517 Node-action: change
 518 Prop-content-length: 83
 519 Content-length: 83
 520
 521 K 9
 522 svk:merge
 523 V 53
 524 b48289b2-9c08-4d72-af37-0358a40b9c15:/branches/left:6
 525 PROPS-END
 526
 527
 528 Node-path: trunk/Makefile
 529 Node-kind: file
 530 Node-action: change
 531 Text-content-length: 2713
 532 Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
 533 Content-length: 2713
 534
 535 # -DCOLLISION_CHECK if you believe that SHA1's
 536 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 537 # enough guarantees about no collisions between objects ever hapenning.
 538 #
 539 # -DNSEC if you want git to care about sub-second file mtimes and ctimes.
 540 # Note that you need some new glibc (at least >2.2.4) for this, and it will
 541 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 542 # break unless your underlying filesystem supports those sub-second times
 543 # (my ext3 doesn't).
 544 CFLAGS=-g -O3 -Wall
 545
 546 CC=gcc
 547
 548
 549 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
 550         cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
 551         check-files ls-tree merge-base merge-cache
 552
 553 all: $(PROG)
 554
 555 install: $(PROG)
 556         install $(PROG) $(HOME)/bin/
 557
 558 LIBS= -lssl -lz
 559
 560 init-db: init-db.o
 561
 562 update-cache: update-cache.o read-cache.o
 563         $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 564
 565 show-diff: show-diff.o read-cache.o
 566         $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 567
 568 write-tree: write-tree.o read-cache.o
 569         $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 570
 571 read-tree: read-tree.o read-cache.o
 572         $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 573
 574 commit-tree: commit-tree.o read-cache.o
 575         $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 576
 577 cat-file: cat-file.o read-cache.o
 578         $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 579
 580 fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
 581         $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 582
 583 checkout-cache: checkout-cache.o read-cache.o
 584         $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 585
 586 diff-tree: diff-tree.o read-cache.o
 587         $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 588
 589 rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
 590         $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 591
 592 show-files: show-files.o read-cache.o
 593         $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 594
 595 check-files: check-files.o read-cache.o
 596         $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 597
 598 ls-tree: ls-tree.o read-cache.o
 599         $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 600
 601 merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
 602         $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 603
 604 merge-cache: merge-cache.o read-cache.o
 605         $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
 606
 607 read-cache.o: cache.h
 608 show-diff.o: cache.h
 609
 610 clean:
 611         rm -f *.o $(PROG)
 612
 613 backup: clean
 614         cd .. ; tar czvf dircache.tar.gz dir-cache
 615
 616