about summary refs log tree commit diff
path: root/third_party/git/t/t9151
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-21T10·03+0300
committerVincent Ambo <mail@tazj.in>2021-09-21T11·29+0300
commit43b1791ec601732ac31195df96781a848360a9ac (patch)
treedaae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t9151
parent2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff)
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping
it in sync with cgit would be easier this way, but it has proven not
to be a big issue.

On the other hand, a vendored copy of git is an annoying maintenance
burden. It is much easier to rebase the single (dottime) patch that we
have.

This removes the vendored copy of git and instead passes the git
source code to cgit via `pkgs.srcOnly`, which includes the applied
patch so that cgit can continue rendering dottime.

Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/t/t9151')
-rw-r--r--third_party/git/t/t9151/.gitignore2
-rwxr-xr-xthird_party/git/t/t9151/make-svnmerge-dump305
-rw-r--r--third_party/git/t/t9151/svn-mergeinfo.dump2388
3 files changed, 0 insertions, 2695 deletions
diff --git a/third_party/git/t/t9151/.gitignore b/third_party/git/t/t9151/.gitignore
deleted file mode 100644
index 587c37dba34b..000000000000
--- a/third_party/git/t/t9151/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-foo
-foo.svn
diff --git a/third_party/git/t/t9151/make-svnmerge-dump b/third_party/git/t/t9151/make-svnmerge-dump
deleted file mode 100755
index e1e138cb1a73..000000000000
--- a/third_party/git/t/t9151/make-svnmerge-dump
+++ /dev/null
@@ -1,305 +0,0 @@
-#!/bin/sh
-#
-# this script sets up a Subversion repository for Makefile in the
-# first ever git merge, as if it were done with svnmerge (SVN 1.5+)
-#
-
-rm -rf foo.svn foo
-set -e
-
-mkdir foo.svn
-svnadmin create foo.svn
-svn co file://`pwd`/foo.svn foo
-
-commit() {
-    i=$(( $1 + 1 ))
-    shift;
-    svn commit -m "(r$i) $*" >/dev/null || exit 1
-    echo $i
-}
-
-say() {
-    echo " * $*"
-}
-
-i=0
-cd foo
-mkdir trunk
-mkdir branches
-mkdir tags
-svn add trunk branches tags
-i=$(commit $i "Setup trunk, branches, and tags")
-
-git cat-file blob 6683463e:Makefile > trunk/Makefile
-svn add trunk/Makefile 
-
-say "Committing ANCESTOR"
-i=$(commit $i "ancestor")
-svn cp trunk branches/left
-
-say "Committing BRANCH POINT"
-i=$(commit $i "make left branch")
-svn cp trunk branches/right
-
-say "Committing other BRANCH POINT"
-i=$(commit $i "make right branch")
-
-say "Committing LEFT UPDATE"
-git cat-file blob 5873b67e:Makefile > branches/left/Makefile
-i=$(commit $i "left update 1")
-
-git cat-file blob 75118b13:Makefile > branches/right/Makefile
-say "Committing RIGHT UPDATE"
-pre_right_update_1=$i
-i=$(commit $i "right update 1")
-
-say "Making more commits on LEFT"
-git cat-file blob ff5ebe39:Makefile > branches/left/Makefile
-i=$(commit $i "left update 2")
-git cat-file blob b5039db6:Makefile > branches/left/Makefile
-i=$(commit $i "left update 3")
-
-say "Making a LEFT SUB-BRANCH"
-svn cp branches/left branches/left-sub
-sub_left_make=$i
-i=$(commit $i "make left sub-branch")
-
-say "Making a commit on LEFT SUB-BRANCH"
-echo "crunch" > branches/left-sub/README
-svn add branches/left-sub/README
-i=$(commit $i "left sub-branch update 1")
-
-say "Merging LEFT to TRUNK"
-svn update
-cd trunk
-svn merge ../branches/left --accept postpone
-git cat-file blob b5039db6:Makefile > Makefile
-svn resolved Makefile
-i=$(commit $i "Merge left to trunk 1")
-cd ..
-
-say "Making more commits on LEFT and RIGHT"
-echo "touche" > branches/left/zlonk
-svn add branches/left/zlonk
-i=$(commit $i "left update 4")
-echo "thwacke" > branches/right/bang
-svn add branches/right/bang
-i=$(commit $i "right update 2")
-
-say "Squash merge of RIGHT tip 2 commits onto TRUNK"
-svn update
-cd trunk
-svn merge -r$pre_right_update_1:$i ../branches/right
-i=$(commit $i "Cherry-pick right 2 commits to trunk")
-cd ..
-
-say "Merging RIGHT to TRUNK"
-svn update
-cd trunk
-svn merge ../branches/right --accept postpone
-git cat-file blob b51ad431:Makefile > Makefile
-svn resolved Makefile
-i=$(commit $i "Merge right to trunk 1")
-cd ..
-
-say "Making more commits on RIGHT and TRUNK"
-echo "whamm" > branches/right/urkkk
-svn add branches/right/urkkk
-i=$(commit $i "right update 3")
-echo "pow" > trunk/vronk
-svn add trunk/vronk
-i=$(commit $i "trunk update 1")
-
-say "Merging RIGHT to LEFT SUB-BRANCH"
-svn update
-cd branches/left-sub
-svn merge ../right --accept postpone
-git cat-file blob b51ad431:Makefile > Makefile
-svn resolved Makefile
-i=$(commit $i "Merge right to left sub-branch")
-cd ../..
-
-say "Making more commits on LEFT SUB-BRANCH and LEFT"
-echo "zowie" > branches/left-sub/wham_eth
-svn add branches/left-sub/wham_eth
-pre_sub_left_update_2=$i
-i=$(commit $i "left sub-branch update 2")
-sub_left_update_2=$i
-echo "eee_yow" > branches/left/glurpp
-svn add branches/left/glurpp
-i=$(commit $i "left update 5")
-
-say "Cherry pick LEFT SUB-BRANCH commit to LEFT"
-svn update
-cd branches/left
-svn merge -r$pre_sub_left_update_2:$sub_left_update_2 ../left-sub
-i=$(commit $i "Cherry-pick left sub-branch commit to left")
-cd ../..
-
-say "Merging LEFT SUB-BRANCH back to LEFT"
-svn update
-cd branches/left
-# it's only a merge because the previous merge cherry-picked the top commit
-svn merge -r$sub_left_make:$sub_left_update_2 ../left-sub --accept postpone
-i=$(commit $i "Merge left sub-branch to left")
-cd ../..
-
-say "Merging EVERYTHING to TRUNK"
-svn update
-cd trunk
-svn merge ../branches/left --accept postpone
-svn resolved bang
-i=$(commit $i "Merge left to trunk 2")
-# this merge, svn happily updates the mergeinfo, but there is actually
-# nothing to merge.  git-svn will not make a meaningless merge commit.
-svn merge ../branches/right --accept postpone
-i=$(commit $i "non-merge right to trunk 2")
-cd ..
-
-say "Branching b1 from trunk"
-svn update
-svn cp trunk branches/b1
-i=$(commit $i "make b1 branch from trunk")
-
-say "Branching b2 from trunk"
-svn update
-svn cp trunk branches/b2
-i=$(commit $i "make b2 branch from trunk")
-
-say "Make a commit to b2"
-svn update
-cd branches/b2
-echo "b2" > b2file
-svn add b2file
-i=$(commit $i "b2 update 1")
-cd ../..
-
-say "Make a commit to b1"
-svn update
-cd branches/b1
-echo "b1" > b1file
-svn add b1file
-i=$(commit $i "b1 update 1")
-cd ../..
-
-say "Merge b1 to trunk"
-svn update
-cd trunk
-svn merge ../branches/b1/ --accept postpone
-i=$(commit $i "Merge b1 to trunk")
-cd ..
-
-say "Make a commit to trunk before merging trunk to b2"
-svn update
-cd trunk
-echo "trunk" > trunkfile
-svn add trunkfile
-i=$(commit $i "trunk commit before merging trunk to b2")
-cd ..
-
-say "Merge trunk to b2"
-svn update
-cd branches/b2
-svn merge ../../trunk/ --accept postpone
-i=$(commit $i "Merge trunk to b2")
-cd ../..
-
-say "Merge b2 to trunk"
-svn update
-cd trunk
-svn merge ../branches/b2/ --accept postpone
-svn resolved b1file
-svn resolved trunkfile
-i=$(commit $i "Merge b2 to trunk")
-cd ..
-
-say "Creating f1 from trunk with a new file"
-svn update
-svn cp trunk branches/f1
-cd branches/f1
-echo "f1" > f1file
-svn add f1file
-cd ../..
-i=$(commit $i "make f1 branch from trunk with a new file")
-
-say "Creating f2 from trunk with a new file"
-svn update
-svn cp trunk branches/f2
-cd branches/f2
-echo "f2" > f2file
-svn add f2file
-cd ../..
-i=$(commit $i "make f2 branch from trunk with a new file")
-
-say "Merge f1 and f2 to trunk in one go"
-svn update
-cd trunk
-svn merge ../branches/f1/ --accept postpone
-svn merge ../branches/f2/ --accept postpone
-i=$(commit $i "Merge f1 and f2 to trunk")
-cd ..
-
-say "Adding subdirectory to LEFT"
-svn update
-cd branches/left
-mkdir subdir
-echo "Yeehaw" > subdir/cowboy
-svn add subdir
-i=$(commit $i "add subdirectory to left branch")
-cd ../../
-
-say "Merging LEFT to TRUNK"
-svn update
-cd trunk
-svn merge ../branches/left --accept postpone
-i=$(commit $i "merge left to trunk")
-cd ..
-
-say "Make PARTIAL branch"
-svn update
-svn cp trunk/subdir branches/partial
-i=$(commit $i "make partial branch")
-
-say "Make a commit to PARTIAL"
-svn update
-cd branches/partial
-echo "racecar" > palindromes
-svn add palindromes
-i=$(commit $i "partial update")
-cd ../../
-
-say "Merge PARTIAL to TRUNK"
-svn update
-cd trunk/subdir
-svn merge ../../branches/partial --accept postpone
-i=$(commit $i "merge partial to trunk")
-cd ../../
-
-say "Tagging trunk"
-svn update
-svn cp trunk tags/v1.0
-i=$(commit $i "tagging v1.0")
-
-say "Branching BUGFIX from v1.0"
-svn update
-svn cp tags/v1.0 branches/bugfix
-i=$(commit $i "make bugfix branch from tag")
-
-say "Make a commit to BUGFIX"
-svn update
-cd branches/bugfix/
-echo "kayak" >> subdir/palindromes
-i=$(commit $i "commit to bugfix")
-cd ../../
-
-say "Merge BUGFIX to TRUNK"
-svn update
-cd trunk
-svn merge ../branches/bugfix/ --accept postpone
-i=$(commit $i "Merge BUGFIX to TRUNK")
-cd ..
-
-cd ..
-svnadmin dump foo.svn > svn-mergeinfo.dump
-
-rm -rf foo foo.svn
diff --git a/third_party/git/t/t9151/svn-mergeinfo.dump b/third_party/git/t/t9151/svn-mergeinfo.dump
deleted file mode 100644
index 47cafcf528d8..000000000000
--- a/third_party/git/t/t9151/svn-mergeinfo.dump
+++ /dev/null
@@ -1,2388 +0,0 @@
-SVN-fs-dump-format-version: 2
-
-UUID: d6191530-2693-4a8e-98e7-b194d4c3edd8
-
-Revision-number: 0
-Prop-content-length: 56
-Content-length: 56
-
-K 8
-svn:date
-V 27
-2010-01-19T04:14:02.832406Z
-PROPS-END
-
-Revision-number: 1
-Prop-content-length: 134
-Content-length: 134
-
-K 7
-svn:log
-V 36
-(r1) Setup trunk, branches, and tags
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:03.055172Z
-PROPS-END
-
-Node-path: branches
-Node-kind: dir
-Node-action: add
-Prop-content-length: 10
-Content-length: 10
-
-PROPS-END
-
-
-Node-path: tags
-Node-kind: dir
-Node-action: add
-Prop-content-length: 10
-Content-length: 10
-
-PROPS-END
-
-
-Node-path: trunk
-Node-kind: dir
-Node-action: add
-Prop-content-length: 10
-Content-length: 10
-
-PROPS-END
-
-
-Revision-number: 2
-Prop-content-length: 111
-Content-length: 111
-
-K 7
-svn:log
-V 13
-(r2) ancestor
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:04.064506Z
-PROPS-END
-
-Node-path: trunk/Makefile
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 2401
-Text-content-md5: bfd8ff778d1492dc6758567373176a89
-Text-content-sha1: 103205ce331f7d64086dba497574734f78439590
-Content-length: 2411
-
-PROPS-END
-# -DCOLLISION_CHECK if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# enough guarantees about no collisions between objects ever hapenning.
-#
-# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
-# Note that you need some new glibc (at least >2.2.4) for this, and it will
-# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
-# break unless your underlying filesystem supports those sub-second times
-# (my ext3 doesn't).
-CFLAGS=-g -O3 -Wall
-
-CC=gcc
-
-
-PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
-	cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
-	check-files ls-tree merge-base
-
-all: $(PROG)
-
-install: $(PROG)
-	install $(PROG) $(HOME)/bin/
-
-LIBS= -lssl -lz
-
-init-db: init-db.o
-
-update-cache: update-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
-
-show-diff: show-diff.o read-cache.o
-	$(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
-
-write-tree: write-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
-
-read-tree: read-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
-
-commit-tree: commit-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
-
-cat-file: cat-file.o read-cache.o
-	$(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
-
-fsck-cache: fsck-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
-
-checkout-cache: checkout-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
-
-diff-tree: diff-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
-
-rev-tree: rev-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
-
-show-files: show-files.o read-cache.o
-	$(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
-
-check-files: check-files.o read-cache.o
-	$(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
-
-ls-tree: ls-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
-
-merge-base: merge-base.o read-cache.o
-	$(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
-
-read-cache.o: cache.h
-show-diff.o: cache.h
-
-clean:
-	rm -f *.o $(PROG)
-
-backup: clean
-	cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
-Revision-number: 3
-Prop-content-length: 119
-Content-length: 119
-
-K 7
-svn:log
-V 21
-(r3) make left branch
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:06.040389Z
-PROPS-END
-
-Node-path: branches/left
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 1
-Node-copyfrom-path: trunk
-
-
-Node-path: branches/left/Makefile
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 2
-Node-copyfrom-path: trunk/Makefile
-Text-copy-source-md5: bfd8ff778d1492dc6758567373176a89
-Text-copy-source-sha1: 103205ce331f7d64086dba497574734f78439590
-
-
-Revision-number: 4
-Prop-content-length: 120
-Content-length: 120
-
-K 7
-svn:log
-V 22
-(r4) make right branch
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:08.040905Z
-PROPS-END
-
-Node-path: branches/right
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 1
-Node-copyfrom-path: trunk
-
-
-Node-path: branches/right/Makefile
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 2
-Node-copyfrom-path: trunk/Makefile
-Text-copy-source-md5: bfd8ff778d1492dc6758567373176a89
-Text-copy-source-sha1: 103205ce331f7d64086dba497574734f78439590
-
-
-Revision-number: 5
-Prop-content-length: 116
-Content-length: 116
-
-K 7
-svn:log
-V 18
-(r5) left update 1
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:09.049169Z
-PROPS-END
-
-Node-path: branches/left/Makefile
-Node-kind: file
-Node-action: change
-Text-content-length: 2465
-Text-content-md5: 16e38d9753b061731650561ce01b1195
-Text-content-sha1: 36da4b84ea9b64218ab48171dfc5c48ae025f38b
-Content-length: 2465
-
-# -DCOLLISION_CHECK if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# enough guarantees about no collisions between objects ever hapenning.
-#
-# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
-# Note that you need some new glibc (at least >2.2.4) for this, and it will
-# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
-# break unless your underlying filesystem supports those sub-second times
-# (my ext3 doesn't).
-CFLAGS=-g -O3 -Wall
-
-CC=gcc
-
-
-PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
-	cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
-	check-files ls-tree merge-base
-
-all: $(PROG)
-
-install: $(PROG)
-	install $(PROG) $(HOME)/bin/
-
-LIBS= -lssl -lz
-
-init-db: init-db.o
-
-update-cache: update-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
-
-show-diff: show-diff.o read-cache.o
-	$(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
-
-write-tree: write-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
-
-read-tree: read-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
-
-commit-tree: commit-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
-
-cat-file: cat-file.o read-cache.o
-	$(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
-
-fsck-cache: fsck-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
-
-checkout-cache: checkout-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
-
-diff-tree: diff-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
-
-rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-show-files: show-files.o read-cache.o
-	$(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
-
-check-files: check-files.o read-cache.o
-	$(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
-
-ls-tree: ls-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
-
-merge-base: merge-base.o read-cache.o
-	$(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
-
-read-cache.o: cache.h
-show-diff.o: cache.h
-
-clean:
-	rm -f *.o $(PROG)
-
-backup: clean
-	cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
-Revision-number: 6
-Prop-content-length: 117
-Content-length: 117
-
-K 7
-svn:log
-V 19
-(r6) right update 1
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:10.049350Z
-PROPS-END
-
-Node-path: branches/right/Makefile
-Node-kind: file
-Node-action: change
-Text-content-length: 2521
-Text-content-md5: 0668418a621333f4aa8b6632cd63e2a0
-Text-content-sha1: 4f29afd038e52f45acb5ef8c41acfc70062a741a
-Content-length: 2521
-
-# -DCOLLISION_CHECK if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# enough guarantees about no collisions between objects ever hapenning.
-#
-# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
-# Note that you need some new glibc (at least >2.2.4) for this, and it will
-# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
-# break unless your underlying filesystem supports those sub-second times
-# (my ext3 doesn't).
-CFLAGS=-g -O3 -Wall
-
-CC=gcc
-
-
-PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
-	cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
-	check-files ls-tree merge-base merge-cache
-
-all: $(PROG)
-
-install: $(PROG)
-	install $(PROG) $(HOME)/bin/
-
-LIBS= -lssl -lz
-
-init-db: init-db.o
-
-update-cache: update-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
-
-show-diff: show-diff.o read-cache.o
-	$(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
-
-write-tree: write-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
-
-read-tree: read-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
-
-commit-tree: commit-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
-
-cat-file: cat-file.o read-cache.o
-	$(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
-
-fsck-cache: fsck-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o $(LIBS)
-
-checkout-cache: checkout-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
-
-diff-tree: diff-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
-
-rev-tree: rev-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS)
-
-show-files: show-files.o read-cache.o
-	$(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
-
-check-files: check-files.o read-cache.o
-	$(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
-
-ls-tree: ls-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
-
-merge-base: merge-base.o read-cache.o
-	$(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
-
-merge-cache: merge-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
-
-read-cache.o: cache.h
-show-diff.o: cache.h
-
-clean:
-	rm -f *.o $(PROG)
-
-backup: clean
-	cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
-Revision-number: 7
-Prop-content-length: 116
-Content-length: 116
-
-K 7
-svn:log
-V 18
-(r7) left update 2
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:11.049209Z
-PROPS-END
-
-Node-path: branches/left/Makefile
-Node-kind: file
-Node-action: change
-Text-content-length: 2529
-Text-content-md5: f6b197cc3f2e89a83e545d4bb003de73
-Text-content-sha1: 2f656677cfec0bceec85e53036ffb63e25126f8e
-Content-length: 2529
-
-# -DCOLLISION_CHECK if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# enough guarantees about no collisions between objects ever hapenning.
-#
-# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
-# Note that you need some new glibc (at least >2.2.4) for this, and it will
-# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
-# break unless your underlying filesystem supports those sub-second times
-# (my ext3 doesn't).
-CFLAGS=-g -O3 -Wall
-
-CC=gcc
-
-
-PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
-	cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
-	check-files ls-tree merge-base
-
-all: $(PROG)
-
-install: $(PROG)
-	install $(PROG) $(HOME)/bin/
-
-LIBS= -lssl -lz
-
-init-db: init-db.o
-
-update-cache: update-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
-
-show-diff: show-diff.o read-cache.o
-	$(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
-
-write-tree: write-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
-
-read-tree: read-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
-
-commit-tree: commit-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
-
-cat-file: cat-file.o read-cache.o
-	$(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
-
-fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-checkout-cache: checkout-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
-
-diff-tree: diff-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
-
-rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-show-files: show-files.o read-cache.o
-	$(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
-
-check-files: check-files.o read-cache.o
-	$(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
-
-ls-tree: ls-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
-
-merge-base: merge-base.o read-cache.o
-	$(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
-
-read-cache.o: cache.h
-show-diff.o: cache.h
-
-clean:
-	rm -f *.o $(PROG)
-
-backup: clean
-	cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
-Revision-number: 8
-Prop-content-length: 116
-Content-length: 116
-
-K 7
-svn:log
-V 18
-(r8) left update 3
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:12.049234Z
-PROPS-END
-
-Node-path: branches/left/Makefile
-Node-kind: file
-Node-action: change
-Text-content-length: 2593
-Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba
-Text-content-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
-Content-length: 2593
-
-# -DCOLLISION_CHECK if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# enough guarantees about no collisions between objects ever hapenning.
-#
-# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
-# Note that you need some new glibc (at least >2.2.4) for this, and it will
-# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
-# break unless your underlying filesystem supports those sub-second times
-# (my ext3 doesn't).
-CFLAGS=-g -O3 -Wall
-
-CC=gcc
-
-
-PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
-	cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
-	check-files ls-tree merge-base
-
-all: $(PROG)
-
-install: $(PROG)
-	install $(PROG) $(HOME)/bin/
-
-LIBS= -lssl -lz
-
-init-db: init-db.o
-
-update-cache: update-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
-
-show-diff: show-diff.o read-cache.o
-	$(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
-
-write-tree: write-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
-
-read-tree: read-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
-
-commit-tree: commit-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
-
-cat-file: cat-file.o read-cache.o
-	$(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
-
-fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-checkout-cache: checkout-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
-
-diff-tree: diff-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
-
-rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-show-files: show-files.o read-cache.o
-	$(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
-
-check-files: check-files.o read-cache.o
-	$(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
-
-ls-tree: ls-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
-
-merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-read-cache.o: cache.h
-show-diff.o: cache.h
-
-clean:
-	rm -f *.o $(PROG)
-
-backup: clean
-	cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
-Revision-number: 9
-Prop-content-length: 123
-Content-length: 123
-
-K 7
-svn:log
-V 25
-(r9) make left sub-branch
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:14.040894Z
-PROPS-END
-
-Node-path: branches/left-sub
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 3
-Node-copyfrom-path: branches/left
-
-
-Node-path: branches/left-sub/Makefile
-Node-kind: file
-Node-action: delete
-
-Node-path: branches/left-sub/Makefile
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 8
-Node-copyfrom-path: branches/left/Makefile
-Text-copy-source-md5: 5ccff689fb290e00b85fe18ee50c54ba
-Text-copy-source-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
-
-
-
-
-Revision-number: 10
-Prop-content-length: 128
-Content-length: 128
-
-K 7
-svn:log
-V 30
-(r10) left sub-branch update 1
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:15.049935Z
-PROPS-END
-
-Node-path: branches/left-sub/README
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 7
-Text-content-md5: fdbcfb6be9afe1121862143f226b51cf
-Text-content-sha1: 1d1f5ea4ceb584337ffe59b8980d92e3b78dfef4
-Content-length: 17
-
-PROPS-END
-crunch
-
-
-Revision-number: 11
-Prop-content-length: 125
-Content-length: 125
-
-K 7
-svn:log
-V 27
-(r11) Merge left to trunk 1
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:18.056594Z
-PROPS-END
-
-Node-path: trunk
-Node-kind: dir
-Node-action: change
-Prop-content-length: 54
-Content-length: 54
-
-K 13
-svn:mergeinfo
-V 19
-/branches/left:2-10
-PROPS-END
-
-
-Node-path: trunk/Makefile
-Node-kind: file
-Node-action: change
-Text-content-length: 2593
-Text-content-md5: 5ccff689fb290e00b85fe18ee50c54ba
-Text-content-sha1: a13de8e23f1483efca3e57b2b64b0ae6f740ce10
-Content-length: 2593
-
-# -DCOLLISION_CHECK if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# enough guarantees about no collisions between objects ever hapenning.
-#
-# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
-# Note that you need some new glibc (at least >2.2.4) for this, and it will
-# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
-# break unless your underlying filesystem supports those sub-second times
-# (my ext3 doesn't).
-CFLAGS=-g -O3 -Wall
-
-CC=gcc
-
-
-PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
-	cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
-	check-files ls-tree merge-base
-
-all: $(PROG)
-
-install: $(PROG)
-	install $(PROG) $(HOME)/bin/
-
-LIBS= -lssl -lz
-
-init-db: init-db.o
-
-update-cache: update-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
-
-show-diff: show-diff.o read-cache.o
-	$(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
-
-write-tree: write-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
-
-read-tree: read-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
-
-commit-tree: commit-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
-
-cat-file: cat-file.o read-cache.o
-	$(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
-
-fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-checkout-cache: checkout-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
-
-diff-tree: diff-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
-
-rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-show-files: show-files.o read-cache.o
-	$(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
-
-check-files: check-files.o read-cache.o
-	$(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
-
-ls-tree: ls-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
-
-merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-read-cache.o: cache.h
-show-diff.o: cache.h
-
-clean:
-	rm -f *.o $(PROG)
-
-backup: clean
-	cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
-Revision-number: 12
-Prop-content-length: 117
-Content-length: 117
-
-K 7
-svn:log
-V 19
-(r12) left update 4
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:19.049620Z
-PROPS-END
-
-Node-path: branches/left/zlonk
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 7
-Text-content-md5: 8b9d8c7c2aaa6167e7d3407a773bbbba
-Text-content-sha1: 9716527ebd70a75c27625cacbeb2d897c6e86178
-Content-length: 17
-
-PROPS-END
-touche
-
-
-Revision-number: 13
-Prop-content-length: 118
-Content-length: 118
-
-K 7
-svn:log
-V 20
-(r13) right update 2
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:20.049659Z
-PROPS-END
-
-Node-path: branches/right/bang
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 8
-Text-content-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
-Text-content-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
-Content-length: 18
-
-PROPS-END
-thwacke
-
-
-Revision-number: 14
-Prop-content-length: 140
-Content-length: 140
-
-K 7
-svn:log
-V 42
-(r14) Cherry-pick right 2 commits to trunk
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:23.041991Z
-PROPS-END
-
-Node-path: trunk
-Node-kind: dir
-Node-action: change
-Prop-content-length: 75
-Content-length: 75
-
-K 13
-svn:mergeinfo
-V 40
-/branches/left:2-10
-/branches/right:6-13
-PROPS-END
-
-
-Node-path: trunk/Makefile
-Node-kind: file
-Node-action: change
-Text-content-length: 2713
-Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
-Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14
-Content-length: 2713
-
-# -DCOLLISION_CHECK if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# enough guarantees about no collisions between objects ever hapenning.
-#
-# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
-# Note that you need some new glibc (at least >2.2.4) for this, and it will
-# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
-# break unless your underlying filesystem supports those sub-second times
-# (my ext3 doesn't).
-CFLAGS=-g -O3 -Wall
-
-CC=gcc
-
-
-PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
-	cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
-	check-files ls-tree merge-base merge-cache
-
-all: $(PROG)
-
-install: $(PROG)
-	install $(PROG) $(HOME)/bin/
-
-LIBS= -lssl -lz
-
-init-db: init-db.o
-
-update-cache: update-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
-
-show-diff: show-diff.o read-cache.o
-	$(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
-
-write-tree: write-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
-
-read-tree: read-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
-
-commit-tree: commit-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
-
-cat-file: cat-file.o read-cache.o
-	$(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
-
-fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-checkout-cache: checkout-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
-
-diff-tree: diff-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
-
-rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-show-files: show-files.o read-cache.o
-	$(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
-
-check-files: check-files.o read-cache.o
-	$(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
-
-ls-tree: ls-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
-
-merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-merge-cache: merge-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
-
-read-cache.o: cache.h
-show-diff.o: cache.h
-
-clean:
-	rm -f *.o $(PROG)
-
-backup: clean
-	cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
-Node-path: trunk/bang
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 13
-Node-copyfrom-path: branches/right/bang
-Text-copy-source-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
-Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
-
-
-Revision-number: 15
-Prop-content-length: 126
-Content-length: 126
-
-K 7
-svn:log
-V 28
-(r15) Merge right to trunk 1
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:26.054456Z
-PROPS-END
-
-Node-path: trunk
-Node-kind: dir
-Node-action: change
-Prop-content-length: 75
-Content-length: 75
-
-K 13
-svn:mergeinfo
-V 40
-/branches/left:2-10
-/branches/right:2-14
-PROPS-END
-
-
-Revision-number: 16
-Prop-content-length: 118
-Content-length: 118
-
-K 7
-svn:log
-V 20
-(r16) right update 3
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:27.049955Z
-PROPS-END
-
-Node-path: branches/right/urkkk
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 6
-Text-content-md5: 5889c8392e16251b0c80927607a03036
-Text-content-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
-Content-length: 16
-
-PROPS-END
-whamm
-
-
-Revision-number: 17
-Prop-content-length: 118
-Content-length: 118
-
-K 7
-svn:log
-V 20
-(r17) trunk update 1
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:28.049615Z
-PROPS-END
-
-Node-path: trunk/vronk
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 4
-Text-content-md5: b2f80fa02a7f1364b9c29d3da44bf9f9
-Text-content-sha1: e994d980c0f2d7a3f76138bf96d57f36f9633828
-Content-length: 14
-
-PROPS-END
-pow
-
-
-Revision-number: 18
-Prop-content-length: 134
-Content-length: 134
-
-K 7
-svn:log
-V 36
-(r18) Merge right to left sub-branch
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:31.061460Z
-PROPS-END
-
-Node-path: branches/left-sub
-Node-kind: dir
-Node-action: change
-Prop-content-length: 55
-Content-length: 55
-
-K 13
-svn:mergeinfo
-V 20
-/branches/right:2-17
-PROPS-END
-
-
-Node-path: branches/left-sub/Makefile
-Node-kind: file
-Node-action: change
-Text-content-length: 2713
-Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
-Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14
-Content-length: 2713
-
-# -DCOLLISION_CHECK if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# enough guarantees about no collisions between objects ever hapenning.
-#
-# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
-# Note that you need some new glibc (at least >2.2.4) for this, and it will
-# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
-# break unless your underlying filesystem supports those sub-second times
-# (my ext3 doesn't).
-CFLAGS=-g -O3 -Wall
-
-CC=gcc
-
-
-PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
-	cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
-	check-files ls-tree merge-base merge-cache
-
-all: $(PROG)
-
-install: $(PROG)
-	install $(PROG) $(HOME)/bin/
-
-LIBS= -lssl -lz
-
-init-db: init-db.o
-
-update-cache: update-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
-
-show-diff: show-diff.o read-cache.o
-	$(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
-
-write-tree: write-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
-
-read-tree: read-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
-
-commit-tree: commit-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
-
-cat-file: cat-file.o read-cache.o
-	$(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
-
-fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-checkout-cache: checkout-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
-
-diff-tree: diff-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
-
-rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-show-files: show-files.o read-cache.o
-	$(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
-
-check-files: check-files.o read-cache.o
-	$(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
-
-ls-tree: ls-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
-
-merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-merge-cache: merge-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
-
-read-cache.o: cache.h
-show-diff.o: cache.h
-
-clean:
-	rm -f *.o $(PROG)
-
-backup: clean
-	cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
-Node-path: branches/left-sub/bang
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 17
-Node-copyfrom-path: branches/right/bang
-Text-copy-source-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
-Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
-
-
-Node-path: branches/left-sub/urkkk
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 17
-Node-copyfrom-path: branches/right/urkkk
-Text-copy-source-md5: 5889c8392e16251b0c80927607a03036
-Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
-
-
-Revision-number: 19
-Prop-content-length: 128
-Content-length: 128
-
-K 7
-svn:log
-V 30
-(r19) left sub-branch update 2
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:32.049244Z
-PROPS-END
-
-Node-path: branches/left-sub/wham_eth
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 6
-Text-content-md5: 757bcd5818572ef3f9580052617c1c8b
-Text-content-sha1: b165019b005c199237ba822c4404e771e93b654a
-Content-length: 16
-
-PROPS-END
-zowie
-
-
-Revision-number: 20
-Prop-content-length: 117
-Content-length: 117
-
-K 7
-svn:log
-V 19
-(r20) left update 5
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:33.049332Z
-PROPS-END
-
-Node-path: branches/left/glurpp
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 8
-Text-content-md5: 14a169f628e0bb59df9c2160649d0a30
-Text-content-sha1: ef7d929e52177767ecfcd28941f6b7f04b4131e3
-Content-length: 18
-
-PROPS-END
-eee_yow
-
-
-Revision-number: 21
-Prop-content-length: 146
-Content-length: 146
-
-K 7
-svn:log
-V 48
-(r21) Cherry-pick left sub-branch commit to left
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:36.041839Z
-PROPS-END
-
-Node-path: branches/left
-Node-kind: dir
-Node-action: change
-Prop-content-length: 56
-Content-length: 56
-
-K 13
-svn:mergeinfo
-V 21
-/branches/left-sub:19
-PROPS-END
-
-
-Node-path: branches/left/wham_eth
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 19
-Node-copyfrom-path: branches/left-sub/wham_eth
-Text-copy-source-md5: 757bcd5818572ef3f9580052617c1c8b
-Text-copy-source-sha1: b165019b005c199237ba822c4404e771e93b654a
-
-
-Revision-number: 22
-Prop-content-length: 133
-Content-length: 133
-
-K 7
-svn:log
-V 35
-(r22) Merge left sub-branch to left
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:39.045014Z
-PROPS-END
-
-Node-path: branches/left
-Node-kind: dir
-Node-action: change
-Prop-content-length: 79
-Content-length: 79
-
-K 13
-svn:mergeinfo
-V 44
-/branches/left-sub:4-19
-/branches/right:2-17
-PROPS-END
-
-
-Node-path: branches/left/Makefile
-Node-kind: file
-Node-action: change
-Text-content-length: 2713
-Text-content-md5: 0afbe34f244cd662b1f97d708c687f90
-Text-content-sha1: 46d9377d783e67a9b581da110352e799517c8a14
-Content-length: 2713
-
-# -DCOLLISION_CHECK if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# enough guarantees about no collisions between objects ever hapenning.
-#
-# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
-# Note that you need some new glibc (at least >2.2.4) for this, and it will
-# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
-# break unless your underlying filesystem supports those sub-second times
-# (my ext3 doesn't).
-CFLAGS=-g -O3 -Wall
-
-CC=gcc
-
-
-PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
-	cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
-	check-files ls-tree merge-base merge-cache
-
-all: $(PROG)
-
-install: $(PROG)
-	install $(PROG) $(HOME)/bin/
-
-LIBS= -lssl -lz
-
-init-db: init-db.o
-
-update-cache: update-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o update-cache update-cache.o read-cache.o $(LIBS)
-
-show-diff: show-diff.o read-cache.o
-	$(CC) $(CFLAGS) -o show-diff show-diff.o read-cache.o $(LIBS)
-
-write-tree: write-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o write-tree write-tree.o read-cache.o $(LIBS)
-
-read-tree: read-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o read-tree read-tree.o read-cache.o $(LIBS)
-
-commit-tree: commit-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o commit-tree commit-tree.o read-cache.o $(LIBS)
-
-cat-file: cat-file.o read-cache.o
-	$(CC) $(CFLAGS) -o cat-file cat-file.o read-cache.o $(LIBS)
-
-fsck-cache: fsck-cache.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o fsck-cache fsck-cache.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-checkout-cache: checkout-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o checkout-cache checkout-cache.o read-cache.o $(LIBS)
-
-diff-tree: diff-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o diff-tree diff-tree.o read-cache.o $(LIBS)
-
-rev-tree: rev-tree.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-show-files: show-files.o read-cache.o
-	$(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS)
-
-check-files: check-files.o read-cache.o
-	$(CC) $(CFLAGS) -o check-files check-files.o read-cache.o $(LIBS)
-
-ls-tree: ls-tree.o read-cache.o
-	$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
-
-merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
-	$(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
-
-merge-cache: merge-cache.o read-cache.o
-	$(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS)
-
-read-cache.o: cache.h
-show-diff.o: cache.h
-
-clean:
-	rm -f *.o $(PROG)
-
-backup: clean
-	cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
-Node-path: branches/left/README
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 18
-Node-copyfrom-path: branches/left-sub/README
-Text-copy-source-md5: fdbcfb6be9afe1121862143f226b51cf
-Text-copy-source-sha1: 1d1f5ea4ceb584337ffe59b8980d92e3b78dfef4
-
-
-Node-path: branches/left/bang
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 18
-Node-copyfrom-path: branches/left-sub/bang
-Text-copy-source-md5: 34c28f1d2dc6a9adeccc4265bf7516cb
-Text-copy-source-sha1: 0bc5bb345c0e71d28f784f12e0bd2d384c283062
-
-
-Node-path: branches/left/urkkk
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 18
-Node-copyfrom-path: branches/left-sub/urkkk
-Text-copy-source-md5: 5889c8392e16251b0c80927607a03036
-Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
-
-
-Revision-number: 23
-Prop-content-length: 125
-Content-length: 125
-
-K 7
-svn:log
-V 27
-(r23) Merge left to trunk 2
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:42.052798Z
-PROPS-END
-
-Node-path: trunk
-Node-kind: dir
-Node-action: change
-Prop-content-length: 99
-Content-length: 99
-
-K 13
-svn:mergeinfo
-V 64
-/branches/left:2-22
-/branches/left-sub:4-19
-/branches/right:2-17
-PROPS-END
-
-
-Node-path: trunk/README
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 22
-Node-copyfrom-path: branches/left/README
-Text-copy-source-md5: fdbcfb6be9afe1121862143f226b51cf
-Text-copy-source-sha1: 1d1f5ea4ceb584337ffe59b8980d92e3b78dfef4
-
-
-Node-path: trunk/glurpp
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 22
-Node-copyfrom-path: branches/left/glurpp
-Text-copy-source-md5: 14a169f628e0bb59df9c2160649d0a30
-Text-copy-source-sha1: ef7d929e52177767ecfcd28941f6b7f04b4131e3
-
-
-Node-path: trunk/urkkk
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 22
-Node-copyfrom-path: branches/left/urkkk
-Text-copy-source-md5: 5889c8392e16251b0c80927607a03036
-Text-copy-source-sha1: 3934264d277a0cf886b6b1c7f2b9e56da2525302
-
-
-Node-path: trunk/wham_eth
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 22
-Node-copyfrom-path: branches/left/wham_eth
-Text-copy-source-md5: 757bcd5818572ef3f9580052617c1c8b
-Text-copy-source-sha1: b165019b005c199237ba822c4404e771e93b654a
-
-
-Node-path: trunk/zlonk
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 22
-Node-copyfrom-path: branches/left/zlonk
-Text-copy-source-md5: 8b9d8c7c2aaa6167e7d3407a773bbbba
-Text-copy-source-sha1: 9716527ebd70a75c27625cacbeb2d897c6e86178
-
-
-Revision-number: 24
-Prop-content-length: 130
-Content-length: 130
-
-K 7
-svn:log
-V 32
-(r24) non-merge right to trunk 2
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-01-19T04:14:44.038434Z
-PROPS-END
-
-Node-path: trunk
-Node-kind: dir
-Node-action: change
-Prop-content-length: 99
-Content-length: 99
-
-K 13
-svn:mergeinfo
-V 64
-/branches/left:2-22
-/branches/left-sub:4-19
-/branches/right:2-22
-PROPS-END
-
-
-Revision-number: 25
-Prop-content-length: 129
-Content-length: 129
-
-K 7
-svn:log
-V 31
-(r25) make b1 branch from trunk
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:18:56.084589Z
-PROPS-END
-
-Node-path: branches/b1
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 24
-Node-copyfrom-path: trunk
-
-
-Revision-number: 26
-Prop-content-length: 129
-Content-length: 129
-
-K 7
-svn:log
-V 31
-(r26) make b2 branch from trunk
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:18:59.076940Z
-PROPS-END
-
-Node-path: branches/b2
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 25
-Node-copyfrom-path: trunk
-
-
-Revision-number: 27
-Prop-content-length: 115
-Content-length: 115
-
-K 7
-svn:log
-V 17
-(r27) b2 update 1
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:01.095762Z
-PROPS-END
-
-Node-path: branches/b2/b2file
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 3
-Text-content-md5: 5edbdd57cba621eb3c6e601bf563b4dc
-Text-content-sha1: 9d4b38049776bd0a2074d67cad23f8eaed35a3b3
-Content-length: 13
-
-PROPS-END
-b2
-
-
-Revision-number: 28
-Prop-content-length: 115
-Content-length: 115
-
-K 7
-svn:log
-V 17
-(r28) b1 update 1
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:03.097465Z
-PROPS-END
-
-Node-path: branches/b1/b1file
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 3
-Text-content-md5: 08778dfd9ac4f603231896aba7aad523
-Text-content-sha1: b551771aa4ad5b14123fc3bd98d89db2bc0edd4f
-Content-length: 13
-
-PROPS-END
-b1
-
-
-Revision-number: 29
-Prop-content-length: 121
-Content-length: 121
-
-K 7
-svn:log
-V 23
-(r29) Merge b1 to trunk
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:06.073175Z
-PROPS-END
-
-Node-path: trunk
-Node-kind: dir
-Node-action: change
-Prop-content-length: 118
-Content-length: 118
-
-K 13
-svn:mergeinfo
-V 83
-/branches/b1:25-28
-/branches/left:2-22
-/branches/left-sub:4-19
-/branches/right:2-22
-PROPS-END
-
-
-Node-path: trunk/b1file
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 28
-Node-copyfrom-path: branches/b1/b1file
-Text-copy-source-md5: 08778dfd9ac4f603231896aba7aad523
-Text-copy-source-sha1: b551771aa4ad5b14123fc3bd98d89db2bc0edd4f
-
-
-Revision-number: 30
-Prop-content-length: 143
-Content-length: 143
-
-K 7
-svn:log
-V 45
-(r30) trunk commit before merging trunk to b2
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:08.096353Z
-PROPS-END
-
-Node-path: trunk/trunkfile
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 6
-Text-content-md5: edf45fe5c98c5367733b39bbb2bb20d9
-Text-content-sha1: 7361d1685e5c86dfc523620cfaf598f196f86239
-Content-length: 16
-
-PROPS-END
-trunk
-
-
-Revision-number: 31
-Prop-content-length: 121
-Content-length: 121
-
-K 7
-svn:log
-V 23
-(r31) Merge trunk to b2
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:11.081541Z
-PROPS-END
-
-Node-path: branches/b2
-Node-kind: dir
-Node-action: change
-Prop-content-length: 131
-Content-length: 131
-
-K 13
-svn:mergeinfo
-V 96
-/branches/b1:25-28
-/branches/left:2-22
-/branches/left-sub:4-19
-/branches/right:2-22
-/trunk:26-30
-PROPS-END
-
-
-Node-path: branches/b2/b1file
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 30
-Node-copyfrom-path: trunk/b1file
-Text-copy-source-md5: 08778dfd9ac4f603231896aba7aad523
-Text-copy-source-sha1: b551771aa4ad5b14123fc3bd98d89db2bc0edd4f
-
-
-Node-path: branches/b2/trunkfile
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 30
-Node-copyfrom-path: trunk/trunkfile
-Text-copy-source-md5: edf45fe5c98c5367733b39bbb2bb20d9
-Text-copy-source-sha1: 7361d1685e5c86dfc523620cfaf598f196f86239
-
-
-Revision-number: 32
-Prop-content-length: 121
-Content-length: 121
-
-K 7
-svn:log
-V 23
-(r32) Merge b2 to trunk
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:14.117939Z
-PROPS-END
-
-Node-path: trunk
-Node-kind: dir
-Node-action: change
-Prop-content-length: 138
-Content-length: 138
-
-K 13
-svn:mergeinfo
-V 102
-/branches/b1:25-28
-/branches/b2:26-31
-/branches/left:2-22
-/branches/left-sub:4-19
-/branches/right:2-22
-PROPS-END
-
-
-Node-path: trunk/b2file
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 31
-Node-copyfrom-path: branches/b2/b2file
-Text-copy-source-md5: 5edbdd57cba621eb3c6e601bf563b4dc
-Text-copy-source-sha1: 9d4b38049776bd0a2074d67cad23f8eaed35a3b3
-
-
-Revision-number: 33
-Prop-content-length: 145
-Content-length: 145
-
-K 7
-svn:log
-V 47
-(r33) make f1 branch from trunk with a new file
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:17.105832Z
-PROPS-END
-
-Node-path: branches/f1
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 32
-Node-copyfrom-path: trunk
-
-
-Node-path: branches/f1/f1file
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 3
-Text-content-md5: 2b1abc6b6c5c0018851f9f8e6475563b
-Text-content-sha1: aece6dfba588900e00d95601d22b4408d49580af
-Content-length: 13
-
-PROPS-END
-f1
-
-
-Revision-number: 34
-Prop-content-length: 145
-Content-length: 145
-
-K 7
-svn:log
-V 47
-(r34) make f2 branch from trunk with a new file
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:20.110057Z
-PROPS-END
-
-Node-path: branches/f2
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 33
-Node-copyfrom-path: trunk
-
-
-Node-path: branches/f2/f2file
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 3
-Text-content-md5: 575c5638d60271457e54ab7d07309502
-Text-content-sha1: 1c49a440c352f3473efa9512255033b94dc7def0
-Content-length: 13
-
-PROPS-END
-f2
-
-
-Revision-number: 35
-Prop-content-length: 128
-Content-length: 128
-
-K 7
-svn:log
-V 30
-(r35) Merge f1 and f2 to trunk
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:24.081490Z
-PROPS-END
-
-Node-path: trunk
-Node-kind: dir
-Node-action: change
-Prop-content-length: 173
-Content-length: 173
-
-K 13
-svn:mergeinfo
-V 137
-/branches/b1:25-28
-/branches/b2:26-31
-/branches/f1:33-34
-/branches/f2:34
-/branches/left:2-22
-/branches/left-sub:4-19
-/branches/right:2-22
-PROPS-END
-
-
-Node-path: trunk/f1file
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 34
-Node-copyfrom-path: branches/f1/f1file
-Text-copy-source-md5: 2b1abc6b6c5c0018851f9f8e6475563b
-Text-copy-source-sha1: aece6dfba588900e00d95601d22b4408d49580af
-
-
-Node-path: trunk/f2file
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 34
-Node-copyfrom-path: branches/f2/f2file
-Text-copy-source-md5: 575c5638d60271457e54ab7d07309502
-Text-copy-source-sha1: 1c49a440c352f3473efa9512255033b94dc7def0
-
-
-Revision-number: 36
-Prop-content-length: 135
-Content-length: 135
-
-K 7
-svn:log
-V 37
-(r36) add subdirectory to left branch
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:26.113516Z
-PROPS-END
-
-Node-path: branches/left/subdir
-Node-kind: dir
-Node-action: add
-Prop-content-length: 10
-Content-length: 10
-
-PROPS-END
-
-
-Node-path: branches/left/subdir/cowboy
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 7
-Text-content-md5: f1d6530278ad409e68cc675476ad995f
-Text-content-sha1: 732d9e3e5c391ffd767a98b45ddcc848de778cea
-Content-length: 17
-
-PROPS-END
-Yeehaw
-
-
-Revision-number: 37
-Prop-content-length: 123
-Content-length: 123
-
-K 7
-svn:log
-V 25
-(r37) merge left to trunk
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:29.073699Z
-PROPS-END
-
-Node-path: trunk
-Node-kind: dir
-Node-action: change
-Prop-content-length: 173
-Content-length: 173
-
-K 13
-svn:mergeinfo
-V 137
-/branches/b1:25-28
-/branches/b2:26-31
-/branches/f1:33-34
-/branches/f2:34
-/branches/left:2-36
-/branches/left-sub:4-19
-/branches/right:2-22
-PROPS-END
-
-
-Node-path: trunk/subdir
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 36
-Node-copyfrom-path: branches/left/subdir
-
-
-Revision-number: 38
-Prop-content-length: 123
-Content-length: 123
-
-K 7
-svn:log
-V 25
-(r38) make partial branch
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:32.072243Z
-PROPS-END
-
-Node-path: branches/partial
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 37
-Node-copyfrom-path: trunk/subdir
-
-
-Revision-number: 39
-Prop-content-length: 118
-Content-length: 118
-
-K 7
-svn:log
-V 20
-(r39) partial update
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:34.097961Z
-PROPS-END
-
-Node-path: branches/partial/palindromes
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 8
-Text-content-md5: 5d1c2024fb5efc4eef812856df1b080c
-Text-content-sha1: 5f8509ddd14c91a52864dd1447344e706f9bbc69
-Content-length: 18
-
-PROPS-END
-racecar
-
-
-Revision-number: 40
-Prop-content-length: 126
-Content-length: 126
-
-K 7
-svn:log
-V 28
-(r40) merge partial to trunk
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:37.080211Z
-PROPS-END
-
-Node-path: trunk/subdir
-Node-kind: dir
-Node-action: change
-Prop-content-length: 246
-Content-length: 246
-
-K 13
-svn:mergeinfo
-V 210
-/branches/b1/subdir:25-28
-/branches/b2/subdir:26-31
-/branches/f1/subdir:33-34
-/branches/f2/subdir:34
-/branches/left/subdir:2-36
-/branches/left-sub/subdir:4-19
-/branches/partial:38-39
-/branches/right/subdir:2-22
-PROPS-END
-
-
-Node-path: trunk/subdir/palindromes
-Node-kind: file
-Node-action: add
-Node-copyfrom-rev: 39
-Node-copyfrom-path: branches/partial/palindromes
-Text-copy-source-md5: 5d1c2024fb5efc4eef812856df1b080c
-Text-copy-source-sha1: 5f8509ddd14c91a52864dd1447344e706f9bbc69
-
-
-Revision-number: 41
-Prop-content-length: 116
-Content-length: 116
-
-K 7
-svn:log
-V 18
-(r41) tagging v1.0
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:40.083460Z
-PROPS-END
-
-Node-path: tags/v1.0
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 40
-Node-copyfrom-path: trunk
-
-
-Revision-number: 42
-Prop-content-length: 131
-Content-length: 131
-
-K 7
-svn:log
-V 33
-(r42) make bugfix branch from tag
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:43.118075Z
-PROPS-END
-
-Node-path: branches/bugfix
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 41
-Node-copyfrom-path: tags/v1.0
-
-
-Revision-number: 43
-Prop-content-length: 120
-Content-length: 120
-
-K 7
-svn:log
-V 22
-(r43) commit to bugfix
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:45.079536Z
-PROPS-END
-
-Node-path: branches/bugfix/subdir/palindromes
-Node-kind: file
-Node-action: change
-Text-content-length: 14
-Text-content-md5: 3b12d98578a3f4320ba97e66da54fe5f
-Text-content-sha1: 672931c9e8ac2c408209efab2f015638b6d64042
-Content-length: 14
-
-racecar
-kayak
-
-
-Revision-number: 44
-Prop-content-length: 125
-Content-length: 125
-
-K 7
-svn:log
-V 27
-(r44) Merge BUGFIX to TRUNK
-K 10
-svn:author
-V 3
-adm
-K 8
-svn:date
-V 27
-2010-02-22T06:19:48.078914Z
-PROPS-END
-
-Node-path: trunk
-Node-kind: dir
-Node-action: change
-Prop-content-length: 210
-Content-length: 210
-
-K 13
-svn:mergeinfo
-V 174
-/branches/b1:25-28
-/branches/b2:26-31
-/branches/bugfix:42-43
-/branches/f1:33-34
-/branches/f2:34
-/branches/left:2-36
-/branches/left-sub:4-19
-/branches/right:2-22
-/tags/v1.0:41
-PROPS-END
-
-
-Node-path: trunk/subdir
-Node-kind: dir
-Node-action: change
-Prop-content-length: 297
-Content-length: 297
-
-K 13
-svn:mergeinfo
-V 261
-/branches/b1/subdir:25-28
-/branches/b2/subdir:26-31
-/branches/bugfix/subdir:42-43
-/branches/f1/subdir:33-34
-/branches/f2/subdir:34
-/branches/left/subdir:2-36
-/branches/left-sub/subdir:4-19
-/branches/partial:38-39
-/branches/right/subdir:2-22
-/tags/v1.0/subdir:41
-PROPS-END
-
-
-Node-path: trunk/subdir/palindromes
-Node-kind: file
-Node-action: change
-Text-content-length: 14
-Text-content-md5: 3b12d98578a3f4320ba97e66da54fe5f
-Text-content-sha1: 672931c9e8ac2c408209efab2f015638b6d64042
-Content-length: 14
-
-racecar
-kayak
-
-