Re: Help needed with CVS

tis 2006-05-16 klockan 21:37 +0200 skrev Guido Serassio:

> Just created a new "nt" branch.
> But what is the better way to merge into it the
> negotiate-nt-2_5 branch (it's based on nt-2_5) ?

get the current version of cvsmergeinit, then run from your new nt
branch working directory

  cvsmergeinit nt-2_5 s2_5
  cvsmerge nt-2_5
  resolve conflicts if any (and exit to commit)

from here on you can run cvsmerge both against HEAD and nt-2_5 to bring
in updates from both, but continued merging from nt-2_5 might be a
little tricky if there has been common 2.5 changes.. (these changes then
come both from HEAD and nt-2_5, sometimes slightly differently)

Regards
Henrik