Re: Handling of rename in merge/join Jonathan S. Shapiro (shap@eros-os.org)
Tue, 18 Apr 2000 11:42:47 -0400

Ben Laurie asked:

> > If A is renamed to B in the trunk and
> > A is still called A in the branch then
> >
> > branch.A is renamed branch.B
> > trunk.B becomes the "ancestor" of branch.B
>
> Do you mean trunk.A is renamed trunk.B?

Nope. That has already been done. The idea is to treat the rename as a modification to the mapping from true-names to fs-names, and apply it in the branch.