> Is there a clean way to merge from a branch in such a way that the
> resulting
> merged file is exactly the same file that was on top of the branch when
> the
> merge command is issued ?
[smc] You mean copy the files on the branch onto the trunk,
throwing
away any changes made on the trunk since the branch was created?
One way:
cvs rtag trunk_right_now everything
cvs rtag -r branch_tag branch_right_now everything
cvs co everything
cd everything
cvs update -d -P -j trunk_right_now -j branch_right_now
Then take a good hard look to be sure that's what
you wanted before comitting.
Hope it helps.
-- steve
>
