git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nigel Magnay" <nigel.magnay@gmail.com>
To: git@vger.kernel.org
Subject: Re: [FEATURE REQUEST] git-svn format-patch
Date: Tue, 11 Mar 2008 17:38:22 +0000	[thread overview]
Message-ID: <320075ff0803111038x36bc40bbkf4b9eec6dd9284fd@mail.gmail.com> (raw)
In-Reply-To: <alpine.LNX.1.00.0801152109580.13593@iabervon.org>

Did there ever become a way of generating svn format diffs from git?

A project is having a hard time applying my format-patch --no-prefix
diffs, but I don't have a tortoiseSVN machine to figure out why..

On Wed, Jan 16, 2008 at 2:20 AM, Daniel Barkalow <barkalow@iabervon.org> wrote:
> On Tue, 15 Jan 2008, Chris Ortman wrote:
>
>
> > You are correct about Tortoise in that it is too strict.
>  > I looked through their code and they have written their own patch
>  > program which keys off these Index: lines
>  > http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/src/TortoiseMerge/Patch.cpp
>  >
>  > I think it could go either way as to if git-svn creates a different
>  > format patch or tsvn accepts multiple formats, but I anticipated
>  > git-svn would be easier to extend so I started here.
>
>  I think it would be worthwhile for tsvn to be less picky in some ways. It
>  should at least be able to accept GNU diff, since sometimes people send
>  maintainers patches prepared by hand (diff -u file.c.orig file.c), and
>  there are comments in there that suggest that they're trying to support
>  non-svn-generated diffs, although they seem to think that such diffs look
>  like:
>
>  Index: filename
>  ============
>  @@ -xxx,xxx +xxx,xxx @@
>  ...
>
>  which isn't anything I've ever seen. You're much more likely to get:
>
>  ...junk...
>  --- junk
>  +++ filename    junk
>  @@ -xxx,xxx +xxx,xxx @@
>
>  And that should be easy enough to parse as an alternative format in tsvn.
>  (I'd send them a patch to do it, but they wouldn't be able to apply it...)
>
>
>         -Daniel
>  *This .sig left intentionally blank*
>  -
>
>
> To unsubscribe from this list: send the line "unsubscribe git" in
>  the body of a message to majordomo@vger.kernel.org
>  More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

  reply	other threads:[~2008-03-11 17:39 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-01-15 13:59 [FEATURE REQUEST] git-svn format-patch Chris Ortman
2008-01-15 14:45 ` Johannes Schindelin
2008-01-15 15:58   ` Chris Ortman
2008-01-15 16:13     ` Johannes Schindelin
2008-01-15 16:23       ` Chris Ortman
2008-01-15 16:52         ` Johannes Schindelin
2008-01-15 17:07           ` Chris Ortman
2008-01-15 17:11             ` Johannes Schindelin
2008-01-15 19:04               ` Chris Ortman
2008-01-15 20:15                 ` Jan Hudec
2008-01-16  6:41                   ` Miles Bader
2008-01-16  6:54                     ` Shawn O. Pearce
2008-01-15 17:10     ` Pascal Obry
2008-01-15 23:11     ` Daniel Barkalow
2008-01-16  0:19       ` Junio C Hamano
2008-01-16  0:58         ` [PATCH/RFC] Do not show "diff --git" metainfo with --no-prefix Junio C Hamano
2008-01-16  1:37           ` Johannes Schindelin
2008-01-16  1:46             ` Junio C Hamano
2008-01-16  1:53               ` Johannes Schindelin
2008-01-16  2:04                 ` Daniel Barkalow
2008-01-16  2:15                   ` Junio C Hamano
2008-01-16  2:08           ` [PATCH v2] " Junio C Hamano
2008-01-16  3:09             ` Linus Torvalds
2008-01-16  3:26               ` Linus Torvalds
2008-01-16  4:04                 ` Daniel Barkalow
2008-01-16  4:22                   ` Linus Torvalds
2008-01-16 20:19                     ` Junio C Hamano
2008-01-16 20:39                       ` Daniel Barkalow
2008-01-17  0:57                         ` Junio C Hamano
2008-01-17  1:11                           ` Johannes Schindelin
2008-01-17  1:19                             ` Junio C Hamano
2008-01-17  1:54                               ` Johannes Schindelin
2008-01-17  2:28                                 ` Junio C Hamano
2008-01-17  1:34                             ` Junio C Hamano
2008-01-17  1:48                               ` Johannes Schindelin
2008-01-17  2:42                                 ` Junio C Hamano
2008-01-17  2:45                                   ` Johannes Schindelin
2008-01-17 14:49                                 ` Jeff King
2008-01-17 15:03                                   ` Jeff King
2008-01-17 15:12                                     ` Johannes Schindelin
2008-01-17 15:18                                       ` Jeff King
2008-01-18  8:22                       ` Junio C Hamano
2008-01-16 17:22                 ` Junio C Hamano
2008-01-16  3:56               ` Daniel Barkalow
2008-01-19  9:36                 ` Jan Hudec
2008-01-16  4:18               ` Junio C Hamano
2008-01-16  2:01       ` [FEATURE REQUEST] git-svn format-patch Chris Ortman
2008-01-15 20:14 ` Jean-Luc Herren
2008-01-15 20:30   ` Chris Ortman
2008-01-16  2:20     ` Daniel Barkalow
2008-03-11 17:38       ` Nigel Magnay [this message]
2008-03-11 19:22         ` Jan Hudec
2008-03-12  4:38         ` Daniel Barkalow

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=320075ff0803111038x36bc40bbkf4b9eec6dd9284fd@mail.gmail.com \
    --to=nigel.magnay@gmail.com \
    --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).