Re: Merge Branch to Trunk - Not Deleting Lines in Trunk

[Kaz Kylheku]

On Thu, 24 Jun 2004, work wrote:

> Date: Thu, 24 Jun 2004 09:59:16 -0400
> From: work <address@hidden>
> To: address@hidden
> Subject: Merge Branch to Trunk - Not Deleting Lines in Trunk
> 
> When I merge from the file on the branch to the file on the trunk, and the 
> file on the branch has deleted lines, the lines are not deleted from the 
> file on the trunk. 
> 
> I'm in the local sandbox for the trunk and using the cvs update -j 
> latest_branch_tag -j latest_trunk_tag and the output says that the file 

This is wrong. Both -j tags should be in the stream that is the source
of the merge, not in the current stream being merged into.


    # merge differences made after merge 10, up to the
    # point where the merge 11 tag was applied:

    cvs up -j merge_010_branch_tag -j merge_011_branch_tag

> already contains the differences, but it really doesn't because the lines 
> don't exist in the branch, but do in the trunk.

The output is correct. You have specified the merge delta 
latest_branch -> latest_trunk.  The branch doesn't have the lines, but
the trunk does. So it looks like you are merging a patch which *adds* the
lines.  Since you are on the latest trunk, that copy already has the
lines, hence ``contains the differences ...''.

RTFM.