basic-improvements merge status

[Zack Weinberg]

Mark Mitchell <mark@codesourcery.com> writes:

>> It is not clear to me that any purpose is served by holding off the
>> merge to trunk until all these issues get resolved.  We could instead
>> do the merge now and fix the problems on the mainline; this would let
>> people move forward with other work.  It would probably be a good idea
>> in that case to hold off on further branch merges and other massively
>> destabilizing patches until these issues do get resolved.
>
> I agree.  These are really problems that should have been detected
> and fixed on BIB, but they slipped through.  Nobody's fault, just
> how it is.
>
> So, do the merge.

Thanks for the vote of confidence ...

... but I just discovered that I don't know how.  "cvs update -j
gcc-3_4-basic-improvements-branch" tries to merge all of the merges
from the trunk to the branch BACK into the trunk, causing a ton of
spurious conflicts.  What's the right way to do this?  (I'm seriously
considering "diff -ruN 3.3/ 3.4b/ | (cd top-of-trunk/ && patch -p1 -E"!)

zw