> -----Original Message----- > From: phi...@apache.org [mailto:phi...@apache.org] > Sent: donderdag 8 november 2012 16:27 > To: comm...@subversion.apache.org > Subject: svn commit: r1407127 - /subversion/branches/1.7.x/STATUS > > Author: philip > Date: Thu Nov 8 15:26:37 2012 > New Revision: 1407127 >
> Approved changes: > ================= > + > + * r1401915 > + Ignore file externals with mergeinfo when merging. > + Justification: > + Prevents a segfault, > + see http://svn.haxx.se/dev/archive-2012-10/0364.shtml > + Branch: > + ^/subversion/branches/1.7.x-r1401915 > + Votes: > + +1: pburba, steveking, philip > In my original review of this patch I asked if this issue was more generic than just file externals? What happens with switched files? (Did I miss an earlier answer?) My guess would be that it is the being switched that defines the behavior here, not being external. And in that case a follow up patch would be necessary to handle the real problem. Bert
