> -----Original Message-----
> From: Greg Stein [mailto:gstein_at_gmail.com]
> Sent: dinsdag 26 april 2011 15:35
> To: dev_at_subversion.apache.org
> Subject: Re: svn commit: r1096738 - in /subversion/trunk/subversion:
> include/svn_wc.h libsvn_client/client.h libsvn_client/diff.c
> libsvn_client/merge.c libsvn_client/repos_diff.c libsvn_wc/deprecated.c
> libsvn_wc/diff.c
>
> On Apr 26, 2011 8:24 AM, <rhuijben_at_apache.org> wrote:
> >
> > Author: rhuijben
> > Date: Tue Apr 26 12:23:37 2011
> > New Revision: 1096738
> >
> > URL: http://svn.apache.org/viewvc?rev=1096738&view=rev
> > Log:
> > Various preparations for moving the working copy obstruction handling
> from
> > the url<->url diff editor into the merge code.
> >
> > The old obstruction checks fully relied on the access baton available
> checks
> > for all directory checks and we can't map this to wc-ng without some
> > restructuring.
>
> I don't understand this part, and it worries me. We should be API
> compatible, and the client should not have to change. Could you explain
> why?
> This could create problems for others.
The code did use access batons. And if the code would still have used have
access batons it would still work ok.
But we started using new apis in the merge code which use only abspaths. And
when you use an abspath of an obstructing working copy you don't notice that
you are changing something that you shouldn't touch.
With the access batons you would get a NULL for the access baton of the
working copy that isn't registered in the parent. With WC-NG you just break
the child working copy if you don't do a proper check.
Bert
Received on 2011-04-26 16:36:29 CEST