Re: merging branch into trunk while keeping trunk fixes

[David Everly]

Please disregard this, I think I fat-fingered something here, because
now it works for me the way I think it should.

On Mon, Dec 03, 2001 at 11:09:02AM -0700, David Everly wrote:
> I have branch MY_BRANCH and HEAD development.  There have been fixes
> to HEAD and new development that does not have these fixes on
> MY_BRANCH.  It seems that the fixes to HEAD are not retained when, in
> my HEAD work area, I do cvs update -j MY_BRANCH.  Instead, files which
> seem to have not changed replace the files that have been changed and
> commited to HEAD.
> 
> Am I doing something wrong here?  Do I have to merge HEAD fixes into
> MY_BRANCH first?
> 
> Thanks,
> Dave.