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@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
