Re: r1438683 - issue #4306 'multiple editor drive file merges record wrong mergeinfo during conflicts'

On Sat, Feb 2, 2013 at 5:35 PM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
> I (Julian Foad) wrote on 2013-01-31:
>
>> Hi Paul. Not sure about this...
>
> 1441810 fixes this and extends the test.

Thanks Julian.

I added r1441810 to the issue #4306 group on 1.7.x, with the caveat
that property conflicts are not handled properly in 1.7, rendering
your latest version of the test problematic on that branch -- see
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?r1=1442368&r2=1442367&pathrev=1442368

-- 
Paul T. Burba
CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development
Skype: ptburba