Re: trunk to branch and branch to trunk merge problem

[Paul Edwards]

"das deniz" <das_deniz@yahoo.com> wrote in message 
56cd2468.0309131634.48c29242@posting.google.com">news:56cd2468.0309131634.48c29242@posting.google.com...
> 6) cvs -kk -j first_tag -j branch_name
>    (diff trunk vs branch to get branch change-set
>    for merging into trunk? ok. but this is not what
>    all the cvs primers use for branch examples....)
>
> would it be possible to make mods to CVS itself to use the revision of
> the file used at the time of the merge out to the branch as the base
> for the later creation of the new-born branch version?

FWIW, I do many joins, and have never been inspired to
only specify a single "-j".  In my environment, it is not
possible for CVS to know what the unspecified "-j" is.

Maybe the primer should be changed to encourage the
use of two "-j" except for "very simple situations"?

I don't know enough about current cvs behaviour as to what
"very simple situations" are.  I personally always create a
tag (on the branch) before issuing the "-j".  I always do the
"-j" between two non-branch tags, I never use a (dynamic)
branch-tag.  That way there is no doubt about what is actually
done.

BFN.  Paul.