Re: [Koha-devel] Cherry-picking and SIPServer unification

2013-06-03 Thread Chris Cormack
On 16 May 2013 06:19, Galen Charlton wrote: > Hi, > > Via the magic of git cherry-pick -X ignore-space-change, it turns out > that at least some patches made on Koha's fork of SipServer (a.k.a. > OpenNCIP) can be brought over mostly as is. > > For example, consider Koha bug 3723 [1], SIPServer bug

[Koha-devel] Cherry-picking and SIPServer unification

2013-05-15 Thread Galen Charlton
Hi, Via the magic of git cherry-pick -X ignore-space-change, it turns out that at least some patches made on Koha's fork of SipServer (a.k.a. OpenNCIP) can be brought over mostly as is. For example, consider Koha bug 3723 [1], SIPServer bug 1180479 [2], and the patch of Colin's I was able to cher