The bug initially described at
<http://www.openoffice.org/issues/show_bug.cgi?id=96877> and in the
upstream tracker at
<http://subversion.tigris.org/issues/show_bug.cgi?id=3067> involves
failed merges, not silent incorrect merges.

I assume this actually refers to the other changes mentioned on the OOo
bug report and noted in the Subversion CHANGES file:
* fixed: 'svn merge' incorrectly reverses previous merges (r32494, -522, -523)

r32494 is a documentation fix
r32522 adds a regression test for the bug
r32523 fixes the bug

Unfortunately r32523 doesn't apply to the current version in lenny/sid.

Ben.

-- 
Ben Hutchings
All the simple programs have been written, and all the good names taken.

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to