On Tue, 18 Jan 2011, Tim Jenness wrote:
> On Jan 17, 2011, at 1:40 AM, Peter W. Draper wrote:
>
>> On Fri, 14 Jan 2011, Tim Jenness wrote:
>>
>>> On Jan 14, 2011, at 6:54 AM, Peter W. Draper wrote:
>>>
>>>> I've updated the JNIAST, JNIHDS and SPLAT JNI libraries for Linux 32/64 bit (SL 4x), Solaris 10 intel 32bit (SUN Studio12) and OS X Leopard 32 bit, so I think only Windows is missing that I need to look at.
>>>>
>>>> I've committed these updates to trunk and namaka.
>>>
>>> I've done the 64-bit snow leopard libraries as well. What's the best way to move these to the branch in svn?
>>
>> A simple copy and commit. You could use "svn merge" but these are
>> binaries so you'll just need to find the originals anyway.
>
> Well, svn merge seemed to work.
I just saw conflicts all when I tried it. Since it worked for you that
would suggest it was really an issue with the diff'ing -- order of
committed changes then.
|