RE: How do I move a branch back to the main trunk without merging ?

[Cameron, Steve]

Derek R. Price wrote:

> The only thing my method shouldn't account for is files removed from the
> branch
> and not the trunk.  You should be able to use a diff to get those if you
> need to.
> Try Steve's method first if you have the A tag or can get it into place.
        [smc]  If you don't have the "A" tag (by which I mean a tag that
denotes the
        point at which the branch forked off from the trunk) you might use
this CVS patch
        http://www.geocities.com/dotslashstar/branch_patch.html and then you
would
        be able to refer to, eg. "BranchX.origin" as a name for the missing
"A" tag.