Re: Assert when Edit Conflict

On Tue, Jan 25, 2011 at 10:15:48AM +0000, Joel Wahlberg wrote:
>
> I've tried to merge some project files but ended up with:
>
> [cid:image002.png_at_01CBBC80.27E388D0]
>
> Pressing Keep the directory resulted in:
>
> [cid:image001.png_at_01CBBC80.27E388D0]

The attached image shows the assertion described in issue #3469:
http://subversion.tigris.org/issues/show_bug.cgi?id=3469

This bug was fixed in 1.6.12. You are running 1.6.7. Please upgrade.

Stefan
Received on 2011-01-25 12:16:37 CET