Re: git-svn and renames

From: David Kastrup <dak@gnu.org>
Date: Jul 10, 2007, 13:20 UTC
Message-ID: <86fy3wpf95.fsf@lola.quinscape.zz>
In-Reply-To: <46938594.2010607@dawes.za.net>

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

Show 17 quoted lines

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

[...]

Show 7 quoted lines

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