Re: svn commit: r1414880 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-11-29 Thread Paul Burba
On Wed, Nov 28, 2012 at 8:27 PM, C. Michael Pilato wrote: > On 11/28/2012 03:39 PM, Julian Foad wrote: >> @@ -2425,10 +2441,8 @@ merge_dir_added(svn_wc_notify_state_t *s >>> } >>>else >>> { >>> - const char *added_path = apr_pstrdup(merge_b->pool,

Re: svn commit: r1414880 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-11-29 Thread C. Michael Pilato
On 11/28/2012 08:27 PM, C. Michael Pilato wrote: > Paul: have you any opinions here? To summarize, I'm wondering why, in > merge_dir_added(), in the switch that begins like so: > > /* Switch on the on-disk state of this path */ > switch (kind) > > ... the merged addition of a brand new dire

Re: svn commit: r1414880 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-11-28 Thread C. Michael Pilato
On 11/28/2012 03:39 PM, Julian Foad wrote: > @@ -2425,10 +2441,8 @@ merge_dir_added(svn_wc_notify_state_t *s >> } >>else >> { >> - const char *added_path = apr_pstrdup(merge_b->pool, >> - local_absp

Re: svn commit: r1414880 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-11-28 Thread Julian Foad
> Author: cmpilato > URL: http://svn.apache.org/viewvc?rev=1414880&view=rev > Log: > After consultation with pburba, restore the 'added_path' merge context > baton member and related functionality removed in r1414810, using it > as a preferred sourch of information about added parent directories,