Andrew's git / gitweb.git / t/t9150/svk-merge.dump
?
t / t9150 / svk-merge.dumpon commit Merge branch 'hv/submodule-find-ff-merge' (2d98446)
   1SVN-fs-dump-format-version: 2
   2
   3UUID: b48289b2-9c08-4d72-af37-0358a40b9c15
   4
   5Revision-number: 0
   6Prop-content-length: 56
   7Content-length: 56
   8
   9K 8
  10svn:date
  11V 27
  122009-10-19T23:44:03.722969Z
  13PROPS-END
  14
  15Revision-number: 1
  16Prop-content-length: 123
  17Content-length: 123
  18
  19K 7
  20svn:log
  21V 24
  22Setup trunk and branches
  23K 10
  24svn:author
  25V 4
  26samv
  27K 8
  28svn:date
  29V 27
  302009-10-19T23:44:04.927533Z
  31PROPS-END
  32
  33Node-path: branches
  34Node-kind: dir
  35Node-action: add
  36Prop-content-length: 10
  37Content-length: 10
  38
  39PROPS-END
  40
  41
  42Node-path: trunk
  43Node-kind: dir
  44Node-action: add
  45Prop-content-length: 10
  46Content-length: 10
  47
  48PROPS-END
  49
  50
  51Revision-number: 2
  52Prop-content-length: 106
  53Content-length: 106
  54
  55K 7
  56svn:log
  57V 8
  58ancestor
  59K 10
  60svn:author
  61V 4
  62samv
  63K 8
  64svn:date
  65V 27
  662009-10-19T23:44:05.835585Z
  67PROPS-END
  68
  69Node-path: trunk/Makefile
  70Node-kind: file
  71Node-action: add
  72Prop-content-length: 10
  73Text-content-length: 2401
  74Text-content-md5: bfd8ff778d1492dc6758567373176a89
  75Content-length: 2411
  76
  77PROPS-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).
  87CFLAGS=-g -O3 -Wall
  88
  89CC=gcc
  90
  91
  92PROG=   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
  96all: $(PROG)
  97
  98install: $(PROG)
  99        install $(PROG) $(HOME)/bin/
 100
 101LIBS= -lssl -lz
 102
 103init-db: init-db.o
 104
 105update-cache: update-cache.o read-cache.o
 106        $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 107
 108show-diff: show-diff.o read-cache.o
 109        $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 110
 111write-tree: write-tree.o read-cache.o
 112        $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 113
 114read-tree: read-tree.o read-cache.o
 115        $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 116
 117commit-tree: commit-tree.o read-cache.o
 118        $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 119
 120cat-file: cat-file.o read-cache.o
 121        $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 122
 123fsck-cache: fsck-cache.o read-cache.o
 124        $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
 125
 126checkout-cache: checkout-cache.o read-cache.o
 127        $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 128
 129diff-tree: diff-tree.o read-cache.o
 130        $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 131
 132rev-tree: rev-tree.o read-cache.o
 133        $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
 134
 135show-files: show-files.o read-cache.o
 136        $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 137
 138check-files: check-files.o read-cache.o
 139        $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 140
 141ls-tree: ls-tree.o read-cache.o
 142        $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 143
 144merge-base: merge-base.o read-cache.o
 145        $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 146
 147read-cache.o: cache.h
 148show-diff.o: cache.h
 149
 150clean:
 151        rm -f *.o $(PROG)
 152
 153backup: clean
 154        cd .. ; tar czvf dircache.tar.gz dir-cache
 155
 156
 157Revision-number: 3
 158Prop-content-length: 115
 159Content-length: 115
 160
 161K 7
 162svn:log
 163V 16
 164make left branch
 165K 10
 166svn:author
 167V 4
 168samv
 169K 8
 170svn:date
 171V 27
 1722009-10-19T23:44:06.719737Z
 173PROPS-END
 174
 175Node-path: branches/left
 176Node-kind: dir
 177Node-action: add
 178Node-copyfrom-rev: 2
 179Node-copyfrom-path: trunk
 180
 181
 182Revision-number: 4
 183Prop-content-length: 112
 184Content-length: 112
 185
 186K 7
 187svn:log
 188V 13
 189left update 1
 190K 10
 191svn:author
 192V 4
 193samv
 194K 8
 195svn:date
 196V 27
 1972009-10-19T23:44:07.167666Z
 198PROPS-END
 199
 200Node-path: branches/left/Makefile
 201Node-kind: file
 202Node-action: change
 203Text-content-length: 2465
 204Text-content-md5: 16e38d9753b061731650561ce01b1195
 205Content-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).
 216CFLAGS=-g -O3 -Wall
 217
 218CC=gcc
 219
 220
 221PROG=   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
 225all: $(PROG)
 226
 227install: $(PROG)
 228        install $(PROG) $(HOME)/bin/
 229
 230LIBS= -lssl -lz
 231
 232init-db: init-db.o
 233
 234update-cache: update-cache.o read-cache.o
 235        $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 236
 237show-diff: show-diff.o read-cache.o
 238        $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 239
 240write-tree: write-tree.o read-cache.o
 241        $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 242
 243read-tree: read-tree.o read-cache.o
 244        $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 245
 246commit-tree: commit-tree.o read-cache.o
 247        $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 248
 249cat-file: cat-file.o read-cache.o
 250        $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 251
 252fsck-cache: fsck-cache.o read-cache.o
 253        $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
 254
 255checkout-cache: checkout-cache.o read-cache.o
 256        $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 257
 258diff-tree: diff-tree.o read-cache.o
 259        $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 260
 261rev-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
 264show-files: show-files.o read-cache.o
 265        $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 266
 267check-files: check-files.o read-cache.o
 268        $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 269
 270ls-tree: ls-tree.o read-cache.o
 271        $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 272
 273merge-base: merge-base.o read-cache.o
 274        $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 275
 276read-cache.o: cache.h
 277show-diff.o: cache.h
 278
 279clean:
 280        rm -f *.o $(PROG)
 281
 282backup: clean
 283        cd .. ; tar czvf dircache.tar.gz dir-cache
 284
 285
 286Revision-number: 5
 287Prop-content-length: 111
 288Content-length: 111
 289
 290K 7
 291svn:log
 292V 12
 293trunk update
 294K 10
 295svn:author
 296V 4
 297samv
 298K 8
 299svn:date
 300V 27
 3012009-10-19T23:44:07.619633Z
 302PROPS-END
 303
 304Node-path: trunk/Makefile
 305Node-kind: file
 306Node-action: change
 307Text-content-length: 2521
 308Text-content-md5: 0668418a621333f4aa8b6632cd63e2a0
 309Content-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).
 320CFLAGS=-g -O3 -Wall
 321
 322CC=gcc
 323
 324
 325PROG=   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
 329all: $(PROG)
 330
 331install: $(PROG)
 332        install $(PROG) $(HOME)/bin/
 333
 334LIBS= -lssl -lz
 335
 336init-db: init-db.o
 337
 338update-cache: update-cache.o read-cache.o
 339        $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 340
 341show-diff: show-diff.o read-cache.o
 342        $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 343
 344write-tree: write-tree.o read-cache.o
 345        $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 346
 347read-tree: read-tree.o read-cache.o
 348        $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 349
 350commit-tree: commit-tree.o read-cache.o
 351        $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 352
 353cat-file: cat-file.o read-cache.o
 354        $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 355
 356fsck-cache: fsck-cache.o read-cache.o
 357        $(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
 358
 359checkout-cache: checkout-cache.o read-cache.o
 360        $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 361
 362diff-tree: diff-tree.o read-cache.o
 363        $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 364
 365rev-tree: rev-tree.o read-cache.o
 366        $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
 367
 368show-files: show-files.o read-cache.o
 369        $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 370
 371check-files: check-files.o read-cache.o
 372        $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 373
 374ls-tree: ls-tree.o read-cache.o
 375        $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 376
 377merge-base: merge-base.o read-cache.o
 378        $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
 379
 380merge-cache: merge-cache.o read-cache.o
 381        $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
 382
 383read-cache.o: cache.h
 384show-diff.o: cache.h
 385
 386clean:
 387        rm -f *.o $(PROG)
 388
 389backup: clean
 390        cd .. ; tar czvf dircache.tar.gz dir-cache
 391
 392
 393Revision-number: 6
 394Prop-content-length: 112
 395Content-length: 112
 396
 397K 7
 398svn:log
 399V 13
 400left update 2
 401K 10
 402svn:author
 403V 4
 404samv
 405K 8
 406svn:date
 407V 27
 4082009-10-19T23:44:08.067554Z
 409PROPS-END
 410
 411Node-path: branches/left/Makefile
 412Node-kind: file
 413Node-action: change
 414Text-content-length: 2593
 415Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba
 416Content-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).
 427CFLAGS=-g -O3 -Wall
 428
 429CC=gcc
 430
 431
 432PROG=   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
 436all: $(PROG)
 437
 438install: $(PROG)
 439        install $(PROG) $(HOME)/bin/
 440
 441LIBS= -lssl -lz
 442
 443init-db: init-db.o
 444
 445update-cache: update-cache.o read-cache.o
 446        $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 447
 448show-diff: show-diff.o read-cache.o
 449        $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 450
 451write-tree: write-tree.o read-cache.o
 452        $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 453
 454read-tree: read-tree.o read-cache.o
 455        $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 456
 457commit-tree: commit-tree.o read-cache.o
 458        $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 459
 460cat-file: cat-file.o read-cache.o
 461        $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 462
 463fsck-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
 466checkout-cache: checkout-cache.o read-cache.o
 467        $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 468
 469diff-tree: diff-tree.o read-cache.o
 470        $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 471
 472rev-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
 475show-files: show-files.o read-cache.o
 476        $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 477
 478check-files: check-files.o read-cache.o
 479        $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 480
 481ls-tree: ls-tree.o read-cache.o
 482        $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 483
 484merge-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
 487read-cache.o: cache.h
 488show-diff.o: cache.h
 489
 490clean:
 491        rm -f *.o $(PROG)
 492
 493backup: clean
 494        cd .. ; tar czvf dircache.tar.gz dir-cache
 495
 496
 497Revision-number: 7
 498Prop-content-length: 131
 499Content-length: 131
 500
 501K 7
 502svn:log
 503V 32
 504merge branch 'left' into 'trunk'
 505K 10
 506svn:author
 507V 4
 508samv
 509K 8
 510svn:date
 511V 27
 5122009-10-19T23:44:08.971801Z
 513PROPS-END
 514
 515Node-path: trunk
 516Node-kind: dir
 517Node-action: change
 518Prop-content-length: 83
 519Content-length: 83
 520
 521K 9
 522svk:merge
 523V 53
 524b48289b2-9c08-4d72-af37-0358a40b9c15:/branches/left:6
 525PROPS-END
 526
 527
 528Node-path: trunk/Makefile
 529Node-kind: file
 530Node-action: change
 531Text-content-length: 2713
 532Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
 533Content-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).
 544CFLAGS=-g -O3 -Wall
 545
 546CC=gcc
 547
 548
 549PROG=   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
 553all: $(PROG)
 554
 555install: $(PROG)
 556        install $(PROG) $(HOME)/bin/
 557
 558LIBS= -lssl -lz
 559
 560init-db: init-db.o
 561
 562update-cache: update-cache.o read-cache.o
 563        $(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
 564
 565show-diff: show-diff.o read-cache.o
 566        $(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
 567
 568write-tree: write-tree.o read-cache.o
 569        $(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
 570
 571read-tree: read-tree.o read-cache.o
 572        $(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
 573
 574commit-tree: commit-tree.o read-cache.o
 575        $(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
 576
 577cat-file: cat-file.o read-cache.o
 578        $(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
 579
 580fsck-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
 583checkout-cache: checkout-cache.o read-cache.o
 584        $(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
 585
 586diff-tree: diff-tree.o read-cache.o
 587        $(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
 588
 589rev-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
 592show-files: show-files.o read-cache.o
 593        $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
 594
 595check-files: check-files.o read-cache.o
 596        $(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
 597
 598ls-tree: ls-tree.o read-cache.o
 599        $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 600
 601merge-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
 604merge-cache: merge-cache.o read-cache.o
 605        $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
 606
 607read-cache.o: cache.h
 608show-diff.o: cache.h
 609
 610clean:
 611        rm -f *.o $(PROG)
 612
 613backup: clean
 614        cd .. ; tar czvf dircache.tar.gz dir-cache
 615
 616