Re: 1.5 merge tracking expectations

On Wed, Jun 11, 2008 at 10:03:44AM -0700, Blair Zajac wrote:
> For our 1.5.0 release notes, we should have a section that lists all the types
> of merge operations we expect or know will fail, so people have the proper
> expectations, and can choose to remain on 1.4 or upgrade to 1.5 and continue to
> use say svnmerge.py.
>
> I'd hate for people to move to 1.5, do a bunch of work in trunk, and then find
> out they can't merge that to a branch, for whatever reason or limitations we have.
>
> For people that do a lot of refactoring and renaming, it looks like 1.5 will
> have issues, given what we saw with the issue-3000 merge?

+1

To chip in an example:

I would still recommend manually replaying on the target branch
any moves that happened on the source branch, before doing a merge.

Seriously.

Stefan