Hi folks,
I am trying to push my local changes to an imported SVN project back to
the SVN repo. For anyone who cares, this is the WebGoat repository which
you can find at http://dawes.za.net/rogan/webgoat/webgoat.git/
I am trying to push it back to the primary GoogleCode repo. I have
successfully managed to push 20 or so commits, but I am now running up
against a problem with a renamed/moved file.
I moved a file from a directory to a subdirectory, and made minimal
changes to this file so that it remained a valid Java class. i.e. I
changed the package, and a few other minor things. As can be seen at
<http://dawes.za.net/gitweb.cgi?p=rogan/webgoat/webgoat.git;a=commitdiff;h=486416188a3e49d60e1510166ac197e5e66cc4d2>,
git detects the rename with 93% similarity.
However, when I try to push this change to the Google repo, git-svn dies
with the following error:
$ git svn dcommit
RA layer request failed: PROPFIND request failed on '/svn/trunk/
webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DefaultLessonAction.java':
PROPFIND of '/svn/trunk/
webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DefaultLessonAction.java':
400 Bad Request (https://webgoat.googlecode.com) at
/home/rdawes/bin/git-svn line 400
[Yes, those paths have a space in them, however this does not seem to
have prevented me from committing the previous 20 or so changes.]
I noted the following in the git-svn documentation, with regards to
handling renames. However, I am not renaming a directory, only a couple
of files.
---- quote ----
BUGS
----
We ignore all SVN properties except svn:executable. Any unhandled
properties are logged to $GIT_DIR/svn/<refname>/unhandled.log
Renamed and copied directories are not detected by git and hence not
tracked when committing to SVN. I do not plan on adding support for
this as it's quite difficult and time-consuming to get working for all
the possible corner cases (git doesn't do it, either). Committing
renamed and copied files are fully supported if they're similar enough
for git to detect them.
---- end quote ----
This is using the latest git as of today:
$ git --version
git version 1.5.3.rc0.81.g1ed84
Any ideas?
Thanks
Rogan
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
