diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-05-23 19:23:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-23 21:37:30 -0700 |
| commit | 36f5b1f0c800a23b9755a0214c1c3250f34f2486 (patch) | |
| tree | 87abde66321dcd36c413d0a4855a8620f225fa2c /contrib/git-svn/Makefile | |
| parent | 304dac15486b6d86d31aea1ca736c2c61f17e902 (diff) | |
| download | git-36f5b1f0c800a23b9755a0214c1c3250f34f2486.tar.gz git-36f5b1f0c800a23b9755a0214c1c3250f34f2486.tar.xz | |
git-svn: ignore expansion of svn:keywords
Unlike my earlier test patch, this also checks svn:eol-style and
makes sure it's applied to working copy updates. This is
definitely more correct than my original attempt at killing
keyword expansions, but I still haven't tested it enough to
know. Feedback would be much appreciated.
Also changed assert_svn_wc_clean() to only work on the svn
working copy. This requires a separate call to assert_tree() to
check wc integrity against git in preparation for another change
I'm planning.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib/git-svn/Makefile')
| -rw-r--r-- | contrib/git-svn/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile index acedf7305..48f60b3a0 100644 --- a/contrib/git-svn/Makefile +++ b/contrib/git-svn/Makefile @@ -30,6 +30,7 @@ git-svn.html : git-svn.txt -f ../../Documentation/asciidoc.conf $< test: git-svn cd t && $(SHELL) ./t0000-contrib-git-svn.sh + cd t && $(SHELL) ./t0001-contrib-git-svn-props.sh clean: rm -f git-svn *.xml *.html *.1 |