basic-improvements merge status

[Jason R Thorpe]

On Mon, Dec 16, 2002 at 12:11:44AM -0800, Zack Weinberg wrote:

 > ... 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"!)

I think you want to use the tag indicating the version of the trunk at
the last merge with the branch tag, like so:

    -j version_of_trunk_at_least_merge -j gcc-3_4-basic-improvements-branch

(sorry, I don't have that tag handy, because the system with my GCC
source tree is powered off at the moment :-)

...because what you want to merge is "all of the differences between the
trunk(at that time) and the branch".

-- 
        -- Jason R. Thorpe <thorpej@wasabisystems.com>