Re: [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1949-gacde270

[Peter Rosin]

Stefano Lattarini skrev 2012-02-16 18:42:
> On 02/16/2012 03:56 PM, Peter Rosin wrote:
>>> diff --git a/lib/ar-lib b/lib/ar-lib
>>> index c0286a4..c698ac5 100755
>>> --- a/lib/ar-lib
>>> +++ b/lib/ar-lib
>>> @@ -4,7 +4,7 @@
>>>  me=ar-lib
>>>  scriptversion=2012-01-30.22; # UTC
>>>  
>>> -# Copyright (C) 2010, 2012 Free Software Foundation, Inc.
>>> +# Copyright (C) 2010-2012 Free Software Foundation, Inc.
>>>  # Written by Peter Rosin <address@hidden>.
>>>  #
>>>  # This program is free software; you can redistribute it and/or modify
>>
>> NOOOOOOOO!
>>
>> You have forked the scripts again!
>>
> Not really: this is just a cosmetic change in the comments, which should't
> cause any merge conflict (unless you plan to modify the copyright line of
> the 'msvc' version of this script in an incompatible way).

If I'm coming up with at change, I'll be sure to update the copyright line
so that it matches master, bringing things back in sync.

> An anyway: I've started the cleanup and testing to finally release 1.12;
> we might be there in a month or so.  At which point, the merging mess
> between msvc, maint and branch-1.11 will go away.
> 
> Similar considerations hold for the 'depcomp' and 'compile' scripts.
> 
>> *snip*
>>
>> These three scripts are the one I care the most about, and they should be
>> modified on the msvc branch.  Other scripts should be modified on maint.
>> That is, if we want them to be strictly better across all branches which
>> I thought we agreed to...
>>
> Or better again, as you implicitly suggested in a past mail of yours:
> let's speed up towards 1.12 and leave all this branching mess behind
> us.

Yes, please :-)

Cheers,
Peter