Stefano Lattarini skrev 2012-01-30 21:49:
> On 01/30/2012 09:21 PM, Peter Rosin wrote:
>>
>> There is one more difference, which is more relevant IMHO, and that is
>> the scriptversion variable. If we start commiting changes to ar-lib on
>> the msvc branch at this point, there will be a conflict once we merge
>> that into master. What scriptversion should we then put on master?
>> It gets ugly, and it was bad to let the lib/scripts diverge in this
>> manner, methinks.
>>
>> I think the best thing to do at this point would be to cherry-pick
>> (using the term loosely) the changes to ar-lib (and compile) into the
>> msvc branch so that things are in sync again.
>>
> In hindsight, I fully agree.
>
>> I don't know if you still want me to push this out on the msvc branch?
>> Should I sync the scripts first?
>>
> If you can, that would be great, thanks. Then you can push the [PATCH 1/4]
> change.
Good, thanks, here's what I did:
1. Synced compile and ar-lib from master to msvc with this msg:
scripts: cherry-pick recent changes from master
* lib/ar-lib: prefer the term "Windows" over "Win32" and quote
'like this', not `like this'.
* lib/compile: Likewise.
2. Commited the 1/4 patch on msvc
3. Merged msvc into master, resolving "conflicts" in the process.
4. Pushed msvc and master
So, all four patches pushed, but 4/4 is not yet on master (no rush).
Cheers,
Peter
