diff options
| author | João Abecasis <joao@abecasis.name> | 2008-07-14 16:28:04 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:35:31 -0700 |
| commit | 63c56022f84ae70dd68763b8eed99bccf58fc98b (patch) | |
| tree | 549f9d173da6bfd1820b392cab5eefd12f3b842c /t/t9110-git-svn-use-svm-props.sh | |
| parent | dc29bc8bd243fcd20815c7dddc15dbae30747c28 (diff) | |
| download | git-63c56022f84ae70dd68763b8eed99bccf58fc98b.tar.gz git-63c56022f84ae70dd68763b8eed99bccf58fc98b.tar.xz | |
git-svn: find-rev and rebase for SVN::Mirror repositories
find-rev and rebase error out on svm because git-svn doesn't trace the
original svn revision numbers back to git commits. The updated test
case, included in the patch, shows the issue and passes with the rest of
the patch applied.
This fixes Git::SVN::find_by_url to find branches based on the
svm:source URL, where useSvmProps is set. Also makes sure cmd_find_rev
and working_head_info use the information they have to correctly track
the source repository. This is enough to get find-rev and rebase
working.
Signed-off-by: João Abecasis <joao@abecasis.name>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9110-git-svn-use-svm-props.sh')
| -rwxr-xr-x | t/t9110-git-svn-use-svm-props.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t9110-git-svn-use-svm-props.sh b/t/t9110-git-svn-use-svm-props.sh index 047659fde..04d2a65c0 100755 --- a/t/t9110-git-svn-use-svm-props.sh +++ b/t/t9110-git-svn-use-svm-props.sh @@ -49,4 +49,13 @@ test_expect_success 'verify metadata for /dir' " grep '^git-svn-id: $dir_url@1 $uuid$' " +test_expect_success 'find commit based on SVN revision number' " + git-svn find-rev r12 | + grep `git rev-parse HEAD` + " + +test_expect_success 'empty rebase' " + git-svn rebase + " + test_done |