Update included popt to version 1.7

[Max Bowsher]

jw schultz wrote:
> On Sat, May 03, 2003 at 04:43:50PM -0701, Jos Backus wrote:
>> On Sun, May 04, 2003 at 12:35:28AM +0100, Max Bowsher wrote:
>>> Jos Backus wrote:
>>>> (Incidentally, this is one of those times I wish we
>>>> were using something better than CVS, which in my
>>>> opinion has poor support for vendor code maintenance.)
>>>
>>> CVS vendor branches aren't perfect, but they do the job
>>> well enough. Is there some reason they aren't being used
>>> for rsync's popt?
>>
>> Not sure, but I guess we should.
>>
>> Fwiw, I see people on the FreeBSD lists complain all the
>> time about problems with taking files off the vendor
>> branch in order to apply local changes. I'm no expert but
>> if these folks complain about the mechanism there must be
>> something to it, methinks.
>
> A couple of notes if you do create a vendor branch, which
> seems a good idea.
>
> Be sure what you import is unchanged from the popt project.
>
> Force the branch number (-b option) to 1.7.1 to match the
> version you are getting.  A this point there aren't any popt
> files with revisions higher than 1.5 so there should be no
> conflict with 1.7.1.

Don't do that - you use the same vendor branch to hold multiple imported
versions, so forcing it to 1.7.1 is just misleading. Better to let it
default to 1.1.1, so people immediately notice it is a vendor branch. (Yes,
I know 1.7.1 can only be a vendor branch since it ends in an odd number, but
it's not what most people are accustomed to seeing.)


Max.