[cvsnt] Re: Branch merging - this seems wrong...

[Tony Hoyle]

Gerhard Fiedler wrote:
> When I say "copy", it's of course not a simple file copy :) Use a directory
> diff, and 
> 1- copy all files that are different from B to A
> 2- copy all files that are on B but not on A from B to A and add them there
> 3- remove all files from A that are on A but not on B
> 4- commit A.
>
Or:

cvs update -r A
cvs update -j A -j B
cvs commit

as in:

Update sandbox to branch A
Merge the differences between A and B into the sandbox.
Commit.

This makes A==B, and should also handle removes and adds.

Tony

* note I might have got the -j arguments the other way around...