git-svn: add --follow-parent and --no-metadata options to fetch
--follow-parent:
This is especially helpful when we're tracking a directory
that has been moved around within the repository, or if we
started tracking a branch and never tracked the trunk it was
descended from.
This relies on the SVN::* libraries to work. We can't
reliably parse path info from the svn command-line client
without relying on XML, so it's better just to have the SVN::*
libs installed.
This also removes oldvalue verification when calling update-ref
In SVN, branches can be deleted, and then recreated under the
same path as the original one with different ancestry
information, causing parent information to be mismatched /
misordered.
Also force the current ref, if existing, to be a parent,
regardless of whether or not it was specified.
--no-metadata:
This gets rid of the git-svn-id: lines at the end of every commit.
With this, you lose the ability to use the rebuild command. If
you ever lose your .git/svn/git-svn/.rev_db file, you won't be
able to fetch again, either. This is fine for one-shot imports.
Also fix some issues with multi-fetch --follow-parent that were
exposed while testing this. Additionally, repack checking is
simplified greatly.
git-svn log will not work on repositories using this, either.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-28 10:39:13 +08:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2006 Eric Wong
|
|
|
|
#
|
|
|
|
|
2007-02-09 18:45:03 +08:00
|
|
|
test_description='git-svn fetching'
|
git-svn: add --follow-parent and --no-metadata options to fetch
--follow-parent:
This is especially helpful when we're tracking a directory
that has been moved around within the repository, or if we
started tracking a branch and never tracked the trunk it was
descended from.
This relies on the SVN::* libraries to work. We can't
reliably parse path info from the svn command-line client
without relying on XML, so it's better just to have the SVN::*
libs installed.
This also removes oldvalue verification when calling update-ref
In SVN, branches can be deleted, and then recreated under the
same path as the original one with different ancestry
information, causing parent information to be mismatched /
misordered.
Also force the current ref, if existing, to be a parent,
regardless of whether or not it was specified.
--no-metadata:
This gets rid of the git-svn-id: lines at the end of every commit.
With this, you lose the ability to use the rebuild command. If
you ever lose your .git/svn/git-svn/.rev_db file, you won't be
able to fetch again, either. This is fine for one-shot imports.
Also fix some issues with multi-fetch --follow-parent that were
exposed while testing this. Additionally, repack checking is
simplified greatly.
git-svn log will not work on repositories using this, either.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-28 10:39:13 +08:00
|
|
|
. ./lib-git-svn.sh
|
|
|
|
|
|
|
|
test_expect_success 'initialize repo' "
|
|
|
|
mkdir import &&
|
|
|
|
cd import &&
|
|
|
|
mkdir -p trunk &&
|
|
|
|
echo hello > trunk/readme &&
|
|
|
|
svn import -m 'initial' . $svnrepo &&
|
|
|
|
cd .. &&
|
|
|
|
svn co $svnrepo wc &&
|
|
|
|
cd wc &&
|
|
|
|
echo world >> trunk/readme &&
|
2007-02-13 08:33:37 +08:00
|
|
|
poke trunk/readme &&
|
git-svn: add --follow-parent and --no-metadata options to fetch
--follow-parent:
This is especially helpful when we're tracking a directory
that has been moved around within the repository, or if we
started tracking a branch and never tracked the trunk it was
descended from.
This relies on the SVN::* libraries to work. We can't
reliably parse path info from the svn command-line client
without relying on XML, so it's better just to have the SVN::*
libs installed.
This also removes oldvalue verification when calling update-ref
In SVN, branches can be deleted, and then recreated under the
same path as the original one with different ancestry
information, causing parent information to be mismatched /
misordered.
Also force the current ref, if existing, to be a parent,
regardless of whether or not it was specified.
--no-metadata:
This gets rid of the git-svn-id: lines at the end of every commit.
With this, you lose the ability to use the rebuild command. If
you ever lose your .git/svn/git-svn/.rev_db file, you won't be
able to fetch again, either. This is fine for one-shot imports.
Also fix some issues with multi-fetch --follow-parent that were
exposed while testing this. Additionally, repack checking is
simplified greatly.
git-svn log will not work on repositories using this, either.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-28 10:39:13 +08:00
|
|
|
svn commit -m 'another commit' &&
|
2007-01-13 18:47:53 +08:00
|
|
|
svn up &&
|
git-svn: add --follow-parent and --no-metadata options to fetch
--follow-parent:
This is especially helpful when we're tracking a directory
that has been moved around within the repository, or if we
started tracking a branch and never tracked the trunk it was
descended from.
This relies on the SVN::* libraries to work. We can't
reliably parse path info from the svn command-line client
without relying on XML, so it's better just to have the SVN::*
libs installed.
This also removes oldvalue verification when calling update-ref
In SVN, branches can be deleted, and then recreated under the
same path as the original one with different ancestry
information, causing parent information to be mismatched /
misordered.
Also force the current ref, if existing, to be a parent,
regardless of whether or not it was specified.
--no-metadata:
This gets rid of the git-svn-id: lines at the end of every commit.
With this, you lose the ability to use the rebuild command. If
you ever lose your .git/svn/git-svn/.rev_db file, you won't be
able to fetch again, either. This is fine for one-shot imports.
Also fix some issues with multi-fetch --follow-parent that were
exposed while testing this. Additionally, repack checking is
simplified greatly.
git-svn log will not work on repositories using this, either.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-28 10:39:13 +08:00
|
|
|
svn mv -m 'rename to thunk' trunk thunk &&
|
|
|
|
svn up &&
|
|
|
|
echo goodbye >> thunk/readme &&
|
2007-02-13 08:33:37 +08:00
|
|
|
poke thunk/readme &&
|
git-svn: add --follow-parent and --no-metadata options to fetch
--follow-parent:
This is especially helpful when we're tracking a directory
that has been moved around within the repository, or if we
started tracking a branch and never tracked the trunk it was
descended from.
This relies on the SVN::* libraries to work. We can't
reliably parse path info from the svn command-line client
without relying on XML, so it's better just to have the SVN::*
libs installed.
This also removes oldvalue verification when calling update-ref
In SVN, branches can be deleted, and then recreated under the
same path as the original one with different ancestry
information, causing parent information to be mismatched /
misordered.
Also force the current ref, if existing, to be a parent,
regardless of whether or not it was specified.
--no-metadata:
This gets rid of the git-svn-id: lines at the end of every commit.
With this, you lose the ability to use the rebuild command. If
you ever lose your .git/svn/git-svn/.rev_db file, you won't be
able to fetch again, either. This is fine for one-shot imports.
Also fix some issues with multi-fetch --follow-parent that were
exposed while testing this. Additionally, repack checking is
simplified greatly.
git-svn log will not work on repositories using this, either.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-28 10:39:13 +08:00
|
|
|
svn commit -m 'bye now' &&
|
|
|
|
cd ..
|
|
|
|
"
|
|
|
|
|
2007-02-09 18:45:03 +08:00
|
|
|
test_expect_success 'init and fetch a moved directory' "
|
git-svn: add --follow-parent and --no-metadata options to fetch
--follow-parent:
This is especially helpful when we're tracking a directory
that has been moved around within the repository, or if we
started tracking a branch and never tracked the trunk it was
descended from.
This relies on the SVN::* libraries to work. We can't
reliably parse path info from the svn command-line client
without relying on XML, so it's better just to have the SVN::*
libs installed.
This also removes oldvalue verification when calling update-ref
In SVN, branches can be deleted, and then recreated under the
same path as the original one with different ancestry
information, causing parent information to be mismatched /
misordered.
Also force the current ref, if existing, to be a parent,
regardless of whether or not it was specified.
--no-metadata:
This gets rid of the git-svn-id: lines at the end of every commit.
With this, you lose the ability to use the rebuild command. If
you ever lose your .git/svn/git-svn/.rev_db file, you won't be
able to fetch again, either. This is fine for one-shot imports.
Also fix some issues with multi-fetch --follow-parent that were
exposed while testing this. Additionally, repack checking is
simplified greatly.
git-svn log will not work on repositories using this, either.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-28 10:39:13 +08:00
|
|
|
git-svn init -i thunk $svnrepo/thunk &&
|
2007-02-09 18:45:03 +08:00
|
|
|
git-svn fetch -i thunk &&
|
2007-01-29 13:34:23 +08:00
|
|
|
test \"\`git-rev-parse --verify refs/remotes/thunk@2\`\" \
|
2007-01-22 18:20:33 +08:00
|
|
|
= \"\`git-rev-parse --verify refs/remotes/thunk~1\`\" &&
|
|
|
|
test \"\`git-cat-file blob refs/remotes/thunk:readme |\
|
2007-01-29 13:34:23 +08:00
|
|
|
sed -n -e '3p'\`\" = goodbye &&
|
2007-02-04 04:49:48 +08:00
|
|
|
test -z \"\`git-config --get svn-remote.svn.fetch \
|
2007-01-29 13:34:23 +08:00
|
|
|
'^trunk:refs/remotes/thunk@2$'\`\"
|
git-svn: add --follow-parent and --no-metadata options to fetch
--follow-parent:
This is especially helpful when we're tracking a directory
that has been moved around within the repository, or if we
started tracking a branch and never tracked the trunk it was
descended from.
This relies on the SVN::* libraries to work. We can't
reliably parse path info from the svn command-line client
without relying on XML, so it's better just to have the SVN::*
libs installed.
This also removes oldvalue verification when calling update-ref
In SVN, branches can be deleted, and then recreated under the
same path as the original one with different ancestry
information, causing parent information to be mismatched /
misordered.
Also force the current ref, if existing, to be a parent,
regardless of whether or not it was specified.
--no-metadata:
This gets rid of the git-svn-id: lines at the end of every commit.
With this, you lose the ability to use the rebuild command. If
you ever lose your .git/svn/git-svn/.rev_db file, you won't be
able to fetch again, either. This is fine for one-shot imports.
Also fix some issues with multi-fetch --follow-parent that were
exposed while testing this. Additionally, repack checking is
simplified greatly.
git-svn log will not work on repositories using this, either.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-28 10:39:13 +08:00
|
|
|
"
|
|
|
|
|
2007-01-23 03:44:57 +08:00
|
|
|
test_expect_success 'init and fetch from one svn-remote' "
|
2007-02-14 09:38:58 +08:00
|
|
|
git-config svn-remote.svn.url $svnrepo &&
|
|
|
|
git-config --add svn-remote.svn.fetch \
|
2007-01-23 03:44:57 +08:00
|
|
|
trunk:refs/remotes/svn/trunk &&
|
2007-02-14 09:38:58 +08:00
|
|
|
git-config --add svn-remote.svn.fetch \
|
2007-01-23 03:44:57 +08:00
|
|
|
thunk:refs/remotes/svn/thunk &&
|
2007-02-09 18:45:03 +08:00
|
|
|
git-svn fetch -i svn/thunk &&
|
2007-01-23 03:44:57 +08:00
|
|
|
test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \
|
|
|
|
= \"\`git-rev-parse --verify refs/remotes/svn/thunk~1\`\" &&
|
|
|
|
test \"\`git-cat-file blob refs/remotes/svn/thunk:readme |\
|
|
|
|
sed -n -e '3p'\`\" = goodbye
|
|
|
|
"
|
|
|
|
|
2007-01-23 07:22:50 +08:00
|
|
|
test_expect_success 'follow deleted parent' "
|
|
|
|
svn cp -m 'resurrecting trunk as junk' \
|
|
|
|
-r2 $svnrepo/trunk $svnrepo/junk &&
|
2007-02-14 09:38:58 +08:00
|
|
|
git-config --add svn-remote.svn.fetch \
|
2007-01-23 07:22:50 +08:00
|
|
|
junk:refs/remotes/svn/junk &&
|
2007-02-09 18:45:03 +08:00
|
|
|
git-svn fetch -i svn/thunk &&
|
|
|
|
git-svn fetch -i svn/junk &&
|
2007-01-23 07:22:50 +08:00
|
|
|
test -z \"\`git diff svn/junk svn/trunk\`\" &&
|
|
|
|
test \"\`git merge-base svn/junk svn/trunk\`\" \
|
|
|
|
= \"\`git rev-parse svn/trunk\`\"
|
|
|
|
"
|
|
|
|
|
2007-01-24 18:16:25 +08:00
|
|
|
test_expect_success 'follow larger parent' "
|
|
|
|
mkdir -p import/trunk/thunk/bump/thud &&
|
|
|
|
echo hi > import/trunk/thunk/bump/thud/file &&
|
|
|
|
svn import -m 'import a larger parent' import $svnrepo/larger-parent &&
|
|
|
|
svn cp -m 'hi' $svnrepo/larger-parent $svnrepo/another-larger &&
|
|
|
|
git-svn init -i larger $svnrepo/another-larger/trunk/thunk/bump/thud &&
|
2007-02-09 18:45:03 +08:00
|
|
|
git-svn fetch -i larger &&
|
2007-01-24 18:16:25 +08:00
|
|
|
git-rev-parse --verify refs/remotes/larger &&
|
|
|
|
git-rev-parse --verify \
|
|
|
|
refs/remotes/larger-parent/trunk/thunk/bump/thud &&
|
|
|
|
test \"\`git-merge-base \
|
|
|
|
refs/remotes/larger-parent/trunk/thunk/bump/thud \
|
|
|
|
refs/remotes/larger\`\" = \
|
|
|
|
\"\`git-rev-parse refs/remotes/larger\`\"
|
|
|
|
true
|
|
|
|
"
|
|
|
|
|
2007-01-26 02:52:36 +08:00
|
|
|
test_expect_success 'follow higher-level parent' "
|
|
|
|
svn mkdir -m 'follow higher-level parent' $svnrepo/blob &&
|
|
|
|
svn co $svnrepo/blob blob &&
|
|
|
|
cd blob &&
|
|
|
|
echo hi > hi &&
|
|
|
|
svn add hi &&
|
2007-01-26 07:44:54 +08:00
|
|
|
svn commit -m 'hihi' &&
|
2007-01-26 02:52:36 +08:00
|
|
|
cd ..
|
|
|
|
svn mkdir -m 'new glob at top level' $svnrepo/glob &&
|
|
|
|
svn mv -m 'move blob down a level' $svnrepo/blob $svnrepo/glob/blob &&
|
|
|
|
git-svn init -i blob $svnrepo/glob/blob &&
|
2007-02-09 18:45:03 +08:00
|
|
|
git-svn fetch -i blob
|
2007-01-26 02:52:36 +08:00
|
|
|
"
|
|
|
|
|
2007-01-26 07:44:54 +08:00
|
|
|
test_expect_success 'follow deleted directory' "
|
2007-01-31 18:45:50 +08:00
|
|
|
svn mv -m 'bye!' $svnrepo/glob/blob/hi $svnrepo/glob/blob/bye &&
|
2007-01-26 07:44:54 +08:00
|
|
|
svn rm -m 'remove glob' $svnrepo/glob &&
|
|
|
|
git-svn init -i glob $svnrepo/glob &&
|
|
|
|
git-svn fetch -i glob &&
|
2007-01-31 18:45:50 +08:00
|
|
|
test \"\`git cat-file blob refs/remotes/glob:blob/bye\`\" = hi &&
|
|
|
|
test \"\`git ls-tree refs/remotes/glob | wc -l \`\" -eq 1
|
2007-01-26 07:44:54 +08:00
|
|
|
"
|
|
|
|
|
2007-01-28 20:59:05 +08:00
|
|
|
# ref: r9270 of the Subversion repository: (http://svn.collab.net/repos/svn)
|
|
|
|
# in trunk/subversion/bindings/swig/perl
|
2007-01-30 16:35:18 +08:00
|
|
|
test_expect_success 'follow-parent avoids deleting relevant info' "
|
2007-01-28 20:59:05 +08:00
|
|
|
mkdir -p import/trunk/subversion/bindings/swig/perl/t &&
|
|
|
|
for i in a b c ; do \
|
|
|
|
echo \$i > import/trunk/subversion/bindings/swig/perl/\$i.pm &&
|
|
|
|
echo _\$i > import/trunk/subversion/bindings/swig/perl/t/\$i.t; \
|
|
|
|
done &&
|
|
|
|
echo 'bad delete test' > \
|
|
|
|
import/trunk/subversion/bindings/swig/perl/t/larger-parent &&
|
|
|
|
echo 'bad delete test 2' > \
|
|
|
|
import/trunk/subversion/bindings/swig/perl/another-larger &&
|
|
|
|
cd import &&
|
|
|
|
svn import -m 'r9270 test' . $svnrepo/r9270 &&
|
|
|
|
cd .. &&
|
|
|
|
svn co $svnrepo/r9270/trunk/subversion/bindings/swig/perl r9270 &&
|
|
|
|
cd r9270 &&
|
|
|
|
svn mkdir native &&
|
|
|
|
svn mv t native/t &&
|
|
|
|
for i in a b c; do svn mv \$i.pm native/\$i.pm; done &&
|
|
|
|
echo z >> native/t/c.t &&
|
2007-02-14 09:38:58 +08:00
|
|
|
poke native/t/c.t &&
|
2007-01-28 20:59:05 +08:00
|
|
|
svn commit -m 'reorg test' &&
|
|
|
|
cd .. &&
|
|
|
|
git-svn init -i r9270-t \
|
|
|
|
$svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t &&
|
2007-02-09 18:45:03 +08:00
|
|
|
git-svn fetch -i r9270-t &&
|
2007-01-28 20:59:05 +08:00
|
|
|
test \`git rev-list r9270-t | wc -l\` -eq 2 &&
|
|
|
|
test \"\`git ls-tree --name-only r9270-t~1\`\" = \
|
|
|
|
\"\`git ls-tree --name-only r9270-t\`\"
|
|
|
|
"
|
|
|
|
|
2007-01-30 16:35:18 +08:00
|
|
|
test_expect_success "track initial change if it was only made to parent" "
|
|
|
|
svn cp -m 'wheee!' $svnrepo/r9270/trunk $svnrepo/r9270/drunk &&
|
|
|
|
git-svn init -i r9270-d \
|
|
|
|
$svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t &&
|
2007-02-09 18:45:03 +08:00
|
|
|
git-svn fetch -i r9270-d &&
|
2007-01-30 16:35:18 +08:00
|
|
|
test \`git rev-list r9270-d | wc -l\` -eq 3 &&
|
|
|
|
test \"\`git ls-tree --name-only r9270-t\`\" = \
|
|
|
|
\"\`git ls-tree --name-only r9270-d\`\" &&
|
|
|
|
test \"\`git rev-parse r9270-t\`\" = \
|
|
|
|
\"\`git rev-parse r9270-d~1\`\"
|
|
|
|
"
|
|
|
|
|
2007-02-09 17:28:30 +08:00
|
|
|
test_expect_success "track multi-parent paths" "
|
|
|
|
svn cp -m 'resurrect /glob' $svnrepo/r9270 $svnrepo/glob &&
|
2007-02-09 18:45:03 +08:00
|
|
|
git-svn multi-fetch &&
|
2007-02-09 17:28:30 +08:00
|
|
|
test \`git cat-file commit refs/remotes/glob | \
|
|
|
|
grep '^parent ' | wc -l\` -eq 2
|
|
|
|
"
|
|
|
|
|
2007-01-31 18:45:50 +08:00
|
|
|
test_expect_success "multi-fetch continues to work" "
|
2007-02-09 18:45:03 +08:00
|
|
|
git-svn multi-fetch
|
2007-01-31 18:45:50 +08:00
|
|
|
"
|
|
|
|
|
|
|
|
test_expect_success "multi-fetch works off a 'clean' repository" "
|
|
|
|
rm -r $GIT_DIR/svn $GIT_DIR/refs/remotes $GIT_DIR/logs &&
|
|
|
|
mkdir $GIT_DIR/svn &&
|
2007-02-09 18:45:03 +08:00
|
|
|
git-svn multi-fetch
|
2007-01-31 18:45:50 +08:00
|
|
|
"
|
|
|
|
|
git-svn: add --follow-parent and --no-metadata options to fetch
--follow-parent:
This is especially helpful when we're tracking a directory
that has been moved around within the repository, or if we
started tracking a branch and never tracked the trunk it was
descended from.
This relies on the SVN::* libraries to work. We can't
reliably parse path info from the svn command-line client
without relying on XML, so it's better just to have the SVN::*
libs installed.
This also removes oldvalue verification when calling update-ref
In SVN, branches can be deleted, and then recreated under the
same path as the original one with different ancestry
information, causing parent information to be mismatched /
misordered.
Also force the current ref, if existing, to be a parent,
regardless of whether or not it was specified.
--no-metadata:
This gets rid of the git-svn-id: lines at the end of every commit.
With this, you lose the ability to use the rebuild command. If
you ever lose your .git/svn/git-svn/.rev_db file, you won't be
able to fetch again, either. This is fine for one-shot imports.
Also fix some issues with multi-fetch --follow-parent that were
exposed while testing this. Additionally, repack checking is
simplified greatly.
git-svn log will not work on repositories using this, either.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-28 10:39:13 +08:00
|
|
|
test_debug 'gitk --all &'
|
|
|
|
|
|
|
|
test_done
|