Allright, I think I am close to a solution with the git:

I am trying some of this:


   1. Recommended!: Creating subversion patches with
git<http://codeprairie.net/blogs/chrisortman/archive/2008/01/14/creating-subversion-patches-with-git.aspx>
   2. Windows and TortoiseSVN-friendly
modifications<https://gist.github.com/nmacinnis/1387609>
   3. 
git-format-patch-to-be-svn-compatible<http://stackoverflow.com/questions/708202/git-format-patch-to-be-svn-compatible>
   4. 
how-to-undo-the-last-git-commit<http://stackoverflow.com/questions/927358/how-to-undo-the-last-git-commit>


Troels Emtekær Linnet


2013/6/24 Edward d'Auvergne <[email protected]>

> I would recommend extending this patch by implementing the reading
> function in full.  There is not much point committing just the
> imports.  This can be implemented in a single commit (well, excluding
> standard debugging commits).  As for the patch format, the GIT patch
> is not compatible with the patch program.  Or at least running:
>
> $ patch -p0 < nmrpipe1.bin
>
> does not work.
>
> Regards,
>
> Edward
>
>
> On 24 June 2013 16:29, Troels E. Linnet
> <[email protected]> wrote:
> > Follow-up Comment #32, sr #3043 (project relax):
> >
> > Imported expected used modules in lib.software.nmrpipe.py.
> >
> > Progress sr #3043: (https://gna.org/support/index.php?3043) Support for
> > NMRPipe seriesTab format *.ser
> >
> > Expected modules for use in libsoftwarenmrpipe.py is imported.
> >
> > ---------
> > Note, test patches with both svn diff and git diff is provided
> >
> > (file #18158, file #18159)
> >     _______________________________________________________
> >
> > Additional Item Attachment:
> >
> > File name: trunk_SeriesTab8               Size:0 KB
> > File name: nmrpipe1                       Size:0 KB
> >
> >
> >     _______________________________________________________
> >
> > Reply to this item at:
> >
> >   <http://gna.org/support/?3043>
> >
> > _______________________________________________
> >   Message sent via/by Gna!
> >   http://gna.org/
> >
> >
> > _______________________________________________
> > relax (http://www.nmr-relax.com)
> >
> > This is the relax-devel mailing list
> > [email protected]
> >
> > To unsubscribe from this list, get a password
> > reminder, or change your subscription options,
> > visit the list information page at
> > https://mail.gna.org/listinfo/relax-devel
>
_______________________________________________
relax (http://www.nmr-relax.com)

This is the relax-devel mailing list
[email protected]

To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-devel

Reply via email to