[Gtkradiant] What format do you want the patches/diffs in ?

[Hydra]

TTimo,
What diff format do you want the patches/diffs in ?

There's a couple of ways I can create them, I can either use diff (from
cygwin)
with the paramaters like this:

diff -Nuar oldsource newsource >mydiff.diff

which gives output similar to this:

        --- eclass.cpp.orig Sat Aug  4 17:28:00 2001
        +++ eclass.cpp Sat Sep 29 18:13:06 2001
        @@ -244,6 +244,9 @@
           return pModel;
         }

        +/*
        + Hydra: replacement below
        +
         void setSpecialLoad(eclass_t *e, const char* pWhat, char*& p)
         {
           CString str = e->comments;
        @@ -266,6 +269,35 @@
               //--LoadModel(str, e);
             }
           }
        +}
        +*/
        +
        +void setSpecialLoad(eclass_t *e, const char* pWhat, char*& p)
        +{
        ...

or I could use wincvs to create the diff by rightclicking the directory or
file
and clicking on "diff selection", which produces a diff that looks like
this:

        CVSROOT: anonymous@zerowing.idsoftware.com:/cvs (password
authentication)
        TCL is *not* available, shell is disabled
        cvs diff eclass.cpp (in directory D:\My
Documents\Source\CVS\GTKRadiant\GtkRadiant\radiant\)
        Index: eclass.cpp
        ===================================================================
        RCS file: /cvs/GtkRadiant/radiant/eclass.cpp,v
        retrieving revision 1.12
        diff -r1.12 eclass.cpp
        246a247,249
        > /*
        >  Hydra: replacement below
        >
        268a272,300
        > }
        > */
        >
        > void setSpecialLoad(eclass_t *e, const char* pWhat, char*& p)
        > {
        ...

The first format obviously has more context information before and after the
changed
lines.

It's no hassle for me to create either kind of diff, I just wanna know
which format you prefer.

Hydra