Re: [PATCH 0/4] Clean up some testsuite issues

[Stefano Lattarini]

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.

>>> Anyway, ok for master?
>>>
>> See the answers to the individual patches.
> 
> Pushed 2/4 and 3/4 to master, and 4/4 to maint, all with the silly '*'
> thing fixed.  I did not merge maint into master, there were too many
> conflicts and I didn't feel like resolving them.
> 
OK, no problem, I can do that later.  The conflicts should be spurious anyway,
unless I'm missing something.

Thanks,
  Stefano