Re: Strange merge behaviour with rc9

Karl Fogel <kfogel_at_red-bean.com> writes:

> Daniel Shahaf <d.s_at_daniel.shahaf.co.il> writes:
>> Has this been fixed? Does it need to be entered to the issue tracker?

> I believe it has not been fixed, and Kari has managed to get it down to
> a pretty minimal (and readable) reproduction script. Kari, if you could
> file an issue about this, linking to this thread and attaching the
> reproduction script, that would be great.

Hi Karl,

Thanks for coming up with the Linux reproduction recipe. I've filed a new
issue for this at http://subversion.tigris.org/issues/show_bug.cgi?id=3250,
adding links to the mails containing the reproduction recipe. The nice
thing is that there is a workaround, although it is a bit tedious to use
(you have to find all N revisions where the conflicting property is touched
and break down the merge to N separate merge runs).

The bug occurs easily, if you use svn:external links that are frequently
updated. That's how I stumbled into it.

I also verified that the bug is still present in trunk.

BR,
Kari.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-07-20 15:04:29 CEST