Richard Henderson wrote:
> Managing branches with svnmerge is nice and friendly. Certainly much
> easier than doing it by hand. However, when it comes time to integrate
> that branch into mainline, one must use more caution.
>
> If you use svnmerge on your branch, and then integrate the branch to
> mainline with "svn merge" (as opposed to applying a patch), then please
> Please PLEASE remove all of the "svn:mergeinfo" properties that get
> brought in before you do the commit. Failure to do so will cause all
> sorts of problems the next time someone tries to merge from trunk out to
> a branch.
Ah, that's why I got all those conflicts on properties when I merged my
branch from trunk recently :
> I've just removed all of the errant properties from trunk.
Alas that doesn't prevent the conflicts, it just makes them "was removed on
trunk" rather than "was changed on trunk"! Well, that's what happened to me
anyway. It's a shame that svn doesn't have separate --accept types for files
and for properties, that would have helped.
cheers,
DaveK
