QuantLib › quantlib-dev

Applying svn patches to the new git repository

Classic

List

Threaded

3 messages Options

Grześ Andruszkiewicz

Applying svn patches to the new git repository

Has anyone succeeded in applying a svn patch to the new git repository?

Details of my problem are in this stackoverflow question: http://stackoverflow.com/questions/16984144/how-can-i-apply-a-tortoisesvn-generated-patch-to-a-git-repository-in-windows

Regards,
Grzegorz

------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
QuantLib-dev mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/quantlib-dev

Luigi Ballabio

Re: Applying svn patches to the new git repository

Hi Grzegorz,
try sending the patch.

Luigi

On Fri, Jun 7, 2013 at 4:24 PM, Grześ Andruszkiewicz <[hidden email]> wrote:

> Has anyone succeeded in applying a svn patch to the new git repository?
>
> Details of my problem are in this stackoverflow question:
> http://stackoverflow.com/questions/16984144/how-can-i-apply-a-tortoisesvn-generated-patch-to-a-git-repository-in-windows
>
> Regards,
> Grzegorz
>
> ------------------------------------------------------------------------------
> How ServiceNow helps IT people transform IT departments:
> 1. A cloud service to automate IT design, transition and operations
> 2. Dashboards that offer high-level views of enterprise services
> 3. A single system of record for all IT processes
> http://p.sf.net/sfu/servicenow-d2d-j
> _______________________________________________
> QuantLib-dev mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/quantlib-dev
>

Grześ Andruszkiewicz

Re: Applying svn patches to the new git repository

Thanks Luigi,

This seems to have worked with git apply -3 <patch name>. Hopefully I will not have to do it again :)

Cheers,
Grzegorz

On 7 June 2013 16:12, Luigi Ballabio <[hidden email]> wrote:

Running

patch -p0 < CatBond_QuantLib_wXL.patch

applied most of the changes on my machine. The VC++ projects had
problems because they were changed in the meantime and patch wasn't
able to find the place to patch. Emacs did, though, except for a
couple of places that were easy to fix by hand anyway.

So, sorry I don't have an answer to "what to do next time", but the
patch I'm attaching was generated by git after I applied your changes.
You should be able to apply it to your repository by running "git am"
on it. It doesn't include files such as
qlo/serialization/create/create_catbonds.cpp etc, because those are
autogenerated and shouldn't be added to the repository. Your build
process will recreate them.

Hope this helps,
Luigi

On Fri, Jun 7, 2013 at 4:34 PM, Grześ Andruszkiewicz <[hidden email]> wrote:
> Hi Luigi,
>
> Sending to the mailing list? Please find attached.
>
> Regards,
> Grzegorz
>
>
> On 7 June 2013 15:33, Luigi Ballabio <[hidden email]> wrote:
>>
>> Hi Grzegorz,
>> try sending the patch.
>>
>> Luigi
>>
>>
>> On Fri, Jun 7, 2013 at 4:24 PM, Grześ Andruszkiewicz <[hidden email]>
>> wrote:
>> > Has anyone succeeded in applying a svn patch to the new git repository?
>> >
>> > Details of my problem are in this stackoverflow question:
>> >
>> > http://stackoverflow.com/questions/16984144/how-can-i-apply-a-tortoisesvn-generated-patch-to-a-git-repository-in-windows
>> >
>> > Regards,
>> > Grzegorz
>> >
>> >
>> > ------------------------------------------------------------------------------
>> > How ServiceNow helps IT people transform IT departments:
>> > 1. A cloud service to automate IT design, transition and operations
>> > 2. Dashboards that offer high-level views of enterprise services
>> > 3. A single system of record for all IT processes
>> > http://p.sf.net/sfu/servicenow-d2d-j
>> > _______________________________________________
>> > QuantLib-dev mailing list
>> > [hidden email]
>> > https://lists.sourceforge.net/lists/listinfo/quantlib-dev
>> >
>
>

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
QuantLib-dev mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/quantlib-dev