Re: svn commit: r1351822 -

2012-06-21 Thread Stefan Sperling
On Wed, Jun 20, 2012 at 03:13:51AM -0700, Bert Huijben wrote: > Another option would be to make svn choose the new behavior by not > passing a conflict resolver the old way. > > And maybe you couls even take this one one step further by also calling > the new standalone conflict resolver from svn.

RE: svn commit: r1351822 -

2012-06-20 Thread Bert Huijben
is one one step further by also calling the new standalone conflict resolver from svn. (Triggered by some notification?) Bert Huijben (Cell phone) From: Stefan Sperling Sent: 20-6-2012 12:00 To: Greg Stein Cc: dev@subversion.apache.org Subject: Re: svn commit: r1351822 - /subversion/trunk/

Re: svn commit: r1351822 - /subversion/trunk/subversion/libsvn_client/switch.c

2012-06-20 Thread Stefan Sperling
On Wed, Jun 20, 2012 at 01:54:29AM -0400, Greg Stein wrote: > On Jun 19, 2012 9:52 PM, wrote: > >... > > + if (resolve_conflicts_post_switch) > > +{ > > + /* Remove the conflict resolution callback from the client context. > > + * We invoke it after of the switch instead of during

Re: svn commit: r1351822 - /subversion/trunk/subversion/libsvn_client/switch.c

2012-06-19 Thread Greg Stein
On Jun 19, 2012 9:52 PM, wrote: >... > + if (resolve_conflicts_post_switch) > +{ > + /* Remove the conflict resolution callback from the client context. > + * We invoke it after of the switch instead of during the switch. */ > + conflict_func2 = ctx->conflict_func2; > + c