git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Kastrup <dak@gnu.org>
To: git@vger.kernel.org
Subject: Re: git-svn and renames
Date: Tue, 10 Jul 2007 15:20:06 +0200	[thread overview]
Message-ID: <86fy3wpf95.fsf@lola.quinscape.zz> (raw)
In-Reply-To: 46938594.2010607@dawes.za.net

Rogan Dawes <lists@dawes.za.net> writes:

> 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 ----

[...]
>
> 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.

> Any ideas?

  dcommit          Commit several diffs to merge with upstream
                     --quiet, -q 
                     --fetch-all, --all 
                     --no-auth-cache 
                     --no-rebase 
                     --no-checkout 
                     --rmdir 
                     --dry-run, -n 
                     --find-copies-harder 
                     --follow-parent, --follow! 
                     --authors-file, -A <arg>
                     --copy-similarity, -C <num>
                     --username <arg>
                     --repack-flags, --repack-args, --repack-opts <arg>
                     --repack <num>
                     --verbose, -v 
                     --edit, -e 
                     --log-window-size <num>
                     --config-dir <arg>
                     -l <num>
                     --merge, -m, -M 
                     --strategy, -s <arg>


Try playing with the --copy-similarity and --find-copies-harder flags.

-- 
David Kastrup

  reply	other threads:[~2007-07-10 13:21 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-10 13:11 git-svn and renames Rogan Dawes
2007-07-10 13:20 ` David Kastrup [this message]
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=86fy3wpf95.fsf@lola.quinscape.zz \
    --to=dak@gnu.org \
    --cc=git@vger.kernel.org \
    /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).