git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git-svn and renames

From
RDRogan Dawes <lists@dawes.za.net>
Date
Jul 10, 2007, 13:11 UTC
Message-ID
<46938594.2010607@dawes.za.net>
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
Next: David Kastrup
Message 1 of 10 in “git-svn and renames”
  1. Rogan DawesJul 10, 2007
  2. David KastrupJul 10, 2007
  3. Rogan DawesJul 10, 2007
  4. Florian WeimerJul 10, 2007
  5. Rogan DawesJul 10, 2007
  6. Eric WongJul 11, 2007
  7. Eric WongJul 12, 2007
  8. Rogan DawesJul 12, 2007
  9. git-svn: fix commiting renames over DAV with funky file namesEric Wong, Jul 16, 2007
  10. Rogan DawesJul 16, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.