Re: [sr #3043] Support for NMRPipe seriesTab format *.ser -- June 25, 2013 - 15:34

Hi Edward.

I am very close to a solution with git.

Can you try to use:
patch -p1 -i FILENAME

-------------------------
Ref: 
http://codeprairie.net/blogs/chrisortman/archive/2008/01/14/creating-subversion-patches-with-git.aspx
-----------------------
That last command will create a patch file for every commit that is in
bugs/facilities-97 but not in castle-svn/trunk
In this case I have a single commit so it creates 
0001-fixes-FACILITIES-97.patch

Now that you've got your patches they can be applied to svn like this

patch -p1 -i 0001-fixes-FACILITIES-97.patch

!!!!
Now here's the gotcha.
patch.exe can either read stdin or take a named file.
My patches would always fail if I used stdin, so using -i to specify
the filename is important.

The -p1 switch tells patch to strip the first part of the path in the
patch file because git generates file paths like
/a/InversionOfControl/MicroKernel....

--------------
Or else we should try to use the: git apply
http://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/

Troels Emtekær Linnet


2013/6/24 Edward d'Auvergne <edward@xxxxxxxxxxxxx>
> 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
> <NO-REPLY.INVALID-ADDRESS@xxxxxxx> 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
> > relax-devel@xxxxxxx
> >
> > 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