From: Rogan Dawes <lists@dawes.za.net>
To: Git Mailing List <git@vger.kernel.org>,
Eric Wong <normalperson@yhbt.net>
Subject: git-svn and renames
Date: Tue, 10 Jul 2007 15:11:48 +0200 [thread overview]
Message-ID: <46938594.2010607@dawes.za.net> (raw)
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 reply other threads:[~2007-07-10 13:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-10 13:11 Rogan Dawes [this message]
2007-07-10 13:20 ` git-svn and renames David Kastrup
2007-07-10 14:18 ` Rogan Dawes
2007-07-10 13:42 ` Florian Weimer
2007-07-10 14:01 ` Rogan Dawes
2007-07-11 8:20 ` Eric Wong
2007-07-12 9:06 ` Eric Wong
2007-07-12 16:51 ` Rogan Dawes
2007-07-16 4:53 ` [PATCH] git-svn: fix commiting renames over DAV with funky file names Eric Wong
2007-07-16 6:36 ` Rogan Dawes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46938594.2010607@dawes.za.net \
--to=lists@dawes.za.net \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).