I'm definitely looking at it today. It's gotta be something easy...
like a merge code-path calling some outdated API which doesn't use the
conflict callback.
On 10/30/07, Mark Phippard <markphip@gmail.com> wrote:
> On 10/29/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> > On 10/29/07, Mark Phippard <markphip@gmail.com> wrote:
> > > On 10/29/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> > > > I just tested the CLI: if user A commits a change to 'svn:ignore' on
> > > > a directory, and user B makes local mods to the same property, then
> > > > when user B updates, the callback is *definitely* called.
> > > >
> > > > I'll take a look at your merge scenario below.
> > >
> > > For what it's worth I ONLY test with merge. I have not looked at
> > > hooking this into the other commands yet.
> > >
> >
> > FWIW, I've ONLY ever tested with update. I've not looked at merges,
> > which is why dlr discovered that the merge code was calling a
> > deprecated property-merging routine. :-)
> >
>
> Ben,
>
> Is this something you are actively looking at? It is OK if you are
> not of course, I am just about to refresh the binaries we have posted
> and I'd gladly hold off a day or two if you were looking at this
> problem.
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 30 16:10:04 2007