On Thu, Oct 20, 2011 at 10:35:41AM -0700, Douglas Wilson wrote: > > On Oct 19, 11:06 am, Douglas Wilson <douglasg.wil...@gmail.com> wrote: > > On Oct 19, 12:29 am, Johan Corveleyn <jcor...@gmail.com> wrote: > > > > > There were a lot of merge-tracking improvements and bugfixes in 1.7, > > > but I'm not sure if this particular issue has been addressed. See > > > http://subversion.apache.org/docs/release-notes/1.7.html#merge-tracki.... > > I checked, there doesn't seem to be anything that specifically > addressed this sort of situation.
Which version of SVN are you running when you hit the problem you described in your first post? 1.6 or 1.7?
