On Tue, 15 Jan 2008, Chris Ortman wrote: > The format that TortoiseSVN expects is the same as the format of svn diff. > The most apparent differences are > > diff --git a/Facilities/EventWiring/Castle.Facilities.EventWiring.Tests/Castle.Facilities.EventWiring.Tests-vs2005.csproj > b/Facilities/EventWiring/Castle.Facilities.EventWiring.Tests/Castle.Facilities.EventWiring.Tests-vs2005.csproj > > becomes > > Index: Facilities/EventWiring/Castle.Facilities.EventWiring.Tests/Castle.Facilities.EventWiring.Tests-vs2005.csproj When --no-prefix is used, we should probably do: Index: <filename> instead of diff --git <filename> <filename> If nothing else, --no-prefix generates patches that git-apply can't apply but thinks that it should be able to because of the "diff --git" line. > and > > index a0a0d38..9676e16 100644 > > becomes > > =================================================================== Can't tell if this matters, or if this is meant to underline the Index line, and if we can leave some extra info after it. The source link you sent requires a login; is this line actually important to recognition, or is it just different in the generated patches? > and > > --- a/Facilities/EventWiring/Castle.Facilities.EventWiring.Tests/Castle.Facilities.EventWiring.Tests-vs2005.csproj > +++ b/Facilities/EventWiring/Castle.Facilities.EventWiring.Tests/Castle.Facilities.EventWiring.Tests-vs2005.csproj > > becomes > > --- Facilities/EventWiring/Castle.Facilities.EventWiring.Tests/Castle.Facilities.EventWiring.Tests-vs2005.csproj (revision 4715) > +++ Facilities/EventWiring/Castle.Facilities.EventWiring.Tests/Castle.Facilities.EventWiring.Tests-vs2005.csproj (working copy) This (putting a description of the revision at the end) would be nice in general for those of us who can't remember what arguments we gave to git diff and can't get back to them without quitting less and no longer having the diff. Of course, it would take a lot of magic to get git to describe things with the svn revision info in a non-svn-specific command, but that may not be necessary if tortoise is willing to apply patches where the base revision is unknown. Or git-svn could just make a lot of tags like "revision 4715". -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
