Hi,
3 errors for git-svn test are below.
expecting success:
rm exec.sh &&
ln -s file exec.sh &&
git update-index exec.sh &&
git commit -m "$name" &&
git svn set-tree --find-copies-harder --rmdir \
${remotes_git_svn}..mybranch5 &&
svn_cmd up "$SVN_TREE" &&
test -h "$SVN_TREE"/exec.sh
[mybranch5 b9d9f8b] executable file becomes a symlink to file
Author: A U Thor <[email protected]>
1 file changed, 1 insertion(+), 1 deletion(-)
rewrite exec.sh (100%)
mode change 100755 => 120000
T exec.sh
M exec.sh
r6 = 611b42ca62477933ab4c1a98e062566269079dab (refs/remotes/git-svn)
Done committing 1 revisions to SVN
Updating '.git/svn/refs/remotes/git-svn/svn-tree':
svn: E235000: In file
'/tmp/buildd/subversion-1.7.5/subversion/libsvn_wc/update_editor.c' line 1583:
assertion failed (action == svn_wc_conflict_action_edit || action ==
svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
Aborted
not ok - 11 executable file becomes a symlink to file
#
# rm exec.sh &&
# ln -s file exec.sh &&
# git update-index exec.sh &&
# git commit -m "$name" &&
# git svn set-tree --find-copies-harder --rmdir \
# ${remotes_git_svn}..mybranch5 &&
# svn_cmd up "$SVN_TREE" &&
# test -h "$SVN_TREE"/exec.sh
expecting success:
chmod +x file &&
ln -s file exec-2.sh &&
git update-index --add file exec-2.sh &&
git commit -m "$name" &&
git svn set-tree --find-copies-harder --rmdir \
${remotes_git_svn}..mybranch5 &&
svn_cmd up "$SVN_TREE" &&
test -x "$SVN_TREE"/file &&
test -h "$SVN_TREE"/exec-2.sh
[mybranch5 abfb48a] new symlink is added to a file that was also just made
executable
Author: A U Thor <[email protected]>
1 file changed, 1 insertion(+)
create mode 120000 exec-2.sh
mode change 100644 => 100755 file
C exec.sh => exec-2.sh
M file
A exec-2.sh
M file
r7 = bd65e0587117ace2aa3df29730b2a3370576c88d (refs/remotes/git-svn)
Done committing 1 revisions to SVN
svn: E155004: Working copy '/home/henrich/git-1.7.10.4/t/trash
directory.t0001-git-svn-basic/.git/svn/refs/remotes/git-svn/svn-tree' locked.
svn: E155004: '/home/henrich/git-1.7.10.4/t/trash
directory.t0001-git-svn-basic/.git/svn/refs/remotes/git-svn/svn-tree' is
already locked.
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
not ok - 12 new symlink is added to a file that was also just made executable
#
# chmod +x file &&
# ln -s file exec-2.sh &&
# git update-index --add file exec-2.sh &&
# git commit -m "$name" &&
# git svn set-tree --find-copies-harder --rmdir \
# ${remotes_git_svn}..mybranch5 &&
# svn_cmd up "$SVN_TREE" &&
# test -x "$SVN_TREE"/file &&
# test -h "$SVN_TREE"/exec-2.sh
expecting success:
echo git help >help &&
rm exec-2.sh &&
cp help exec-2.sh &&
git update-index exec-2.sh &&
git commit -m "$name" &&
git svn set-tree --find-copies-harder --rmdir \
${remotes_git_svn}..mybranch5 &&
svn_cmd up "$SVN_TREE" &&
test -f "$SVN_TREE"/exec-2.sh &&
test ! -h "$SVN_TREE"/exec-2.sh &&
test_cmp help "$SVN_TREE"/exec-2.sh
[mybranch5 837b509] modify a symlink to become a file
Author: A U Thor <[email protected]>
1 file changed, 1 insertion(+), 1 deletion(-)
rewrite exec-2.sh (100%)
mode change 120000 => 100644
T exec-2.sh
M exec-2.sh
r8 = 44bdea66f19809562a86c2fa85909b79ba48d6bc (refs/remotes/git-svn)
Done committing 1 revisions to SVN
svn: E155004: Working copy '/home/henrich/git-1.7.10.4/t/trash
directory.t0001-git-svn-basic/.git/svn/refs/remotes/git-svn/svn-tree' locked.
svn: E155004: '/home/henrich/git-1.7.10.4/t/trash
directory.t0001-git-svn-basic/.git/svn/refs/remotes/git-svn/svn-tree' is
already locked.
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
not ok - 13 modify a symlink to become a file
#
# echo git help >help &&
# rm exec-2.sh &&
# cp help exec-2.sh &&
# git update-index exec-2.sh &&
# git commit -m "$name" &&
# git svn set-tree --find-copies-harder --rmdir \
# ${remotes_git_svn}..mybranch5 &&
# svn_cmd up "$SVN_TREE" &&
# test -f "$SVN_TREE"/exec-2.sh &&
# test ! -h "$SVN_TREE"/exec-2.sh &&
# test_cmp help "$SVN_TREE"/exec-2.sh
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
