mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-15 13:43:45 +01:00
Code Activity
git/t/t9159-git-svn-no-parent-mergeinfo.sh

42 lines
1.3 KiB
Bash
Raw Normal View History

git-svn: Demonstrate a bug with root commits in mergeinfo ranges If a svn:mergeinfo range starts at a commit that was converted as a git root commit (e.g., r1 or a branch that was created out of thin air), then there is an error when git-svn tries to run git rev-list "$bottom_commit^..$top_commit" because $bottom_commit (the git commit corresponding to r1) has no parent. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Eric Wong <normalperson@yhbt.net>
2011-06-18 08:47:58 +02:00
#!/bin/sh
test_description='git svn handling of root commits in merge ranges'
. ./lib-git-svn.sh
t9159-*.sh: skip for mergeinfo test for svn <= 1.4 t9159 relies on the command-line syntax of svn >= 1.5. Given the declining install base of older svn versions, it is not worth our time to support older svn syntax. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-09-10 19:40:10 +02:00
svn_ver="$(svn --version --quiet)"
case $svn_ver in
0.* | 1.[0-4].*)
skip_all="skipping git-svn test - SVN too old ($svn_ver)"
test_done
;;
esac
git-svn: Correctly handle root commits in mergeinfo ranges If the bottom of a mergeinfo range is a commit that maps to a git root commit, then it doesn't have a parent. In such a case, use git commit range "$top_commit" rather than "$bottom_commit^..$top_commit". [ew: line-wrap at 80 columns] Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Eric Wong <normalperson@yhbt.net>
2011-06-18 08:48:00 +02:00
test_expect_success 'test handling of root commits in merge ranges' '
git-svn: Demonstrate a bug with root commits in mergeinfo ranges If a svn:mergeinfo range starts at a commit that was converted as a git root commit (e.g., r1 or a branch that was created out of thin air), then there is an error when git-svn tries to run git rev-list "$bottom_commit^..$top_commit" because $bottom_commit (the git commit corresponding to r1) has no parent. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Eric Wong <normalperson@yhbt.net>
2011-06-18 08:47:58 +02:00
mkdir -p init/trunk init/branches init/tags &&
echo "r1" > init/trunk/file.txt &&
svn_cmd import -m "initial import" init "$svnrepo" &&
svn_cmd co "$svnrepo" tmp &&
(
cd tmp &&
echo "r2" > trunk/file.txt &&
svn_cmd commit -m "Modify file.txt on trunk" &&
svn_cmd cp trunk@1 branches/a &&
svn_cmd commit -m "Create branch a from trunk r1" &&
svn_cmd propset svn:mergeinfo /trunk:1-2 branches/a &&
svn_cmd commit -m "Fake merge of trunk r2 into branch a" &&
mkdir branches/b &&
echo "r5" > branches/b/file2.txt &&
svn_cmd add branches/b &&
svn_cmd commit -m "Create branch b from thin air" &&
echo "r6" > branches/b/file2.txt &&
svn_cmd commit -m "Modify file2.txt on branch b" &&
svn_cmd cp branches/b@5 branches/c &&
svn_cmd commit -m "Create branch c from branch b r5" &&
svn_cmd propset svn:mergeinfo /branches/b:5-6 branches/c &&
svn_cmd commit -m "Fake merge of branch b r6 into branch c"
) &&
git svn init -s "$svnrepo" &&
git svn fetch
'
test_done
Copy permalink