From: Eric Wong <normalperson@yhbt.net>
To: "Karl Hasselström" <kha@treskal.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Fix path duplication in git svn commit-diff
Date: Sun, 1 Jun 2008 02:48:40 -0700 [thread overview]
Message-ID: <20080601094840.GB16064@hand.yhbt.net> (raw)
In-Reply-To: <20080517150330.31899.12398.stgit@yoghurt>
Karl Hasselström <kha@treskal.com> wrote:
> Given an SVN repo file:///tmp/svntest/repo, trying to commit changes
> to a file proj/trunk/foo.txt in that repo with this command line
>
> git svn commit-diff -r2 HEAD^ HEAD file:///tmp/svntest/repo/proj/trunk
>
> gave the error message
>
> Filesystem has no item: File not found: transaction '2-6', path
> '/proj/trunk/proj/trunk/foo.txt'
>
> This fixes the duplication.
>
> Signed-off-by: Karl Hasselström <kha@treskal.com>
Thanks Karl,
Acked-by: Eric Wong <normalperson@yhbt.net>
> ---
>
> I really don't have a clue as to why this was broken, but the patch
> fixes the problem for me, and doesn't break the tests. I got the idea
> from dcommit, which is setting svn_path to '' unconditionally.
Hardly anybody uses commit-diff directly :)
It was a low-level plumbing command that I used to implement the
original version of dcommit in.
> git-svn.perl | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
>
> diff --git a/git-svn.perl b/git-svn.perl
> index 2c53f39..1c2a10a 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -741,7 +741,7 @@ sub cmd_commit_diff {
> my $usage = "Usage: $0 commit-diff -r<revision> ".
> "<tree-ish> <tree-ish> [<URL>]";
> fatal($usage) if (!defined $ta || !defined $tb);
> - my $svn_path;
> + my $svn_path = '';
> if (!defined $url) {
> my $gs = eval { Git::SVN->new };
> if (!$gs) {
> @@ -765,7 +765,6 @@ sub cmd_commit_diff {
> $_message ||= get_commit_entry($tb)->{log};
> }
> my $ra ||= Git::SVN::Ra->new($url);
> - $svn_path ||= $ra->{svn_path};
> my $r = $_revision;
> if ($r eq 'HEAD') {
> $r = $ra->get_latest_revnum;
>
--
Eric Wong
next prev parent reply other threads:[~2008-06-01 9:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-17 15:07 [PATCH] Fix path duplication in git svn commit-diff Karl Hasselström
2008-06-01 9:48 ` Eric Wong [this message]
2008-06-02 11:53 ` Karl Hasselström
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080601094840.GB16064@hand.yhbt.net \
--to=normalperson@yhbt.net \
--cc=git@vger.kernel.org \
--cc=kha@treskal.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).