From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Bosch To: mike stump Cc: jsm28@cam.ac.uk, gcc@gcc.gnu.org Subject: Re: Ada documentation issues Date: Fri, 05 Oct 2001 14:48:00 -0000 Message-id: References: <200110052140.OAA03082@kankakee.wrs.com> X-SW-Source: 2001-10/msg00337.html On Fri, 5 Oct 2001, mike stump wrote: :-) I used to do this for the C++ frontend... Basically, I just had reference copies of what I last merged from my tree, what was at the FSF, and used diff -r and patch to run in the new changes to my copy of the other tree, and then diff once more to obtain the FSF version of the patch, and then run that set into the FSF tree. This was a unidirection process. You do it twice, and you then have a bidirectional process. Stir and run once a week, and presto. My experience was that is was fairly reliable and didn't take much effort (I had a script that did it all). The only think I had to do by hand was to resolve conflicts. I always considered just putting it in cron and running nightly, but never got around to it. I'd like to have a somewhat better log than "merged in changes", but maybe that will be too hard. -Geert