Update included popt to version 1.7

[Max Bowsher]

Jos Backus wrote:
> On Sun, May 04, 2003 at 12:37:02AM -0700, jw schultz wrote:
>> If you want to do a vendor branch in CVS for the popt
>> resync, OK.  If you don't, that's OK too, but consider
>> making a symbolic tag to help the process next time.
>
> Even though it's likely to be a trivial operation, given my inexperience
with
> branching/tagging in CVS I'd rather have somebody else make this decision
and
> lay down the appropriate tag(s) to ease future upgrades.

Here are some example cvs commands to discuss.
(Obviously, you'd want more descriptive log messages, and you might want a
different naming scheme for the tags. The 2 "cvs tag" operations aren't
strictly necessary, just for convenience in locating local modifications.)


cd <dir containing just the wanted files from popt 1.6.4>
cvs import -m. rsync/popt IMPORT POPT-1_6_4

cd <dir containing just the wanted files from popt 1.7>
cvs import -m. rsync/popt IMPORT POPT-1_7

cd <somewhere else>
cvs checkout rsync
cd rsync/popt
cvs tag popt-1_6_4-merged
cvs update -jPOPT_1_6_4 -jPOPT_1_7
# Manually check you are happy with the merge
cvs commit -m.
cvs tag popt-1_7-merged