On Thu, Nov 8, 2012 at 10:32 AM, Bert Huijben <b...@qqmail.nl> wrote: > > >> -----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?)
Sorry Bert, I missed your reply to r1401915. Reintegrate merges and automatic merges which follow the same code path, don't allow the merge to proceed if there are switched subtrees present. You can use --ignore-ancestry to force the latter to run, but then mergetracking isn't active so the segfault is not an issue since it occurs find_unmerged_mergeinfo, which is only run in mergetracking aware "reintegrate" type merges. Alternatively you can use a 2-URL merge, but that doesn't hit the "reintegrate" merge code path either. So as of right now I don't see any further problems. -- Paul T. Burba CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development Skype: ptburba > 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 > -- Paul T. Burba CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development Skype: ptburba
