Re: RFC: Readline 5.1 import

Daniel Jacobowitz
2006-04-24T22:10:21Z

On Thu, Apr 20, 2006 at 04:41:04PM -0400, Elena Zannoni wrote:
>
> FWIW when you leave things open ended, and say you are in no hurry and
> going to wait, please, before pointing fingers, specify what time
> frame you are thinking of. I cannot read your mind.

I'll try not to leave things as open ended in the future. In return,
when you promise to have something done by the following evening and
can not for whatever reason, please don't disregard later inquiries on
that subject; a simple "I haven't gotten to it yet" in response to my
ping would have been great.

[Not that I'm great about that either.]

> We do already have a branch named FSF where the readline imports have
> been done before. The same branch has ben used for importing pristine
> versions of texinfo.

Thank you. I didn't see that the same vendor branch had been used for
different imports; this was the missing bit I needed.

I've done the merge. I encourage anyone interested to check out
readline_5_1-import-branch and test it! I've already tested on
Cygwin, mingw32, and Debian GNU/Linux.

I will spare the list the longer version of my opinion of cvs import
and cvs update -j as a merge and conflict resolution technique. The
original version of this merge (which I did entirely with diff and
patch) was much easier. I hope it's practical to move src to svn some
day soon; the merge tools I've used there are much more useful.

> Anyway, I have prepared things for you to do the real merge. I have
>
> - imported 5.1 on the fsf branch.
> - Tagged the readline sources
> - created a branch for the merge to happen there.
>
> What you need to do now is check out the branch
> readline_5_1-import-branch for gdb+dejagnu
>
> then do
> cvs update -jFSF:yesterday -jFSF src/readline
>
> resolve the conflicts, cvs add new files, cvs rm files (and
> directories), and commit. I would suggest letting a few others give it
> a spin on the branch with exotic architectures, then merge everything
> into mainline in a single swoop. Note that you need to delete
> yourself the files that have disappeared from readline between 4.3 and
> 5.1 if any, cvs will not do that automatically.

Would you be willing to add instructions on this process to gdbint, for
future generations?