On Tue, May 18, 2010 at 5:42 PM, <stsp_at_apache.org> wrote:
> Author: stsp
> Date: Tue May 18 15:42:57 2010
> New Revision: 945708
>
> URL: http://svn.apache.org/viewvc?rev=945708&view=rev
> Log:
> On the 1.6.x-issue3469 branch, fix issue #3469 "tree conflict inside of
> directory external causes assertion to fail".
Thanks for fixing this, Stefan.
I haven't looked at the fix itself, but from reading the log message a
question popped up in my mind (not hindered by any in-depth knowledge
on the subject). See below.
> In addition to fixing the assertion failure, make 'svn revert' and
> 'svn resolved' actually work for tree conflicted externals.
>
> * subversion/libsvn_wc/adm_ops.c
> (revert_internal): Do not error out if directories cannot be locked as
> part of the current access baton set. Just ignore such directories.
> The attempt to revert tree-conflicted externals led to an "Unable to
> lock <external>" error which we never saw before because the assertion
> failure described in issue #3469 prevented us from entering this situation.
>
> * subversion/libsvn_wc/entries.c
> (svn_wc__walk_entries_and_tc): Don't give up right away if a directory
> cannot be locked. Try retrieving a lock for the parent directory instead,
> and only give up if that fails, too. Prevents 'svn resolved -R' from
> silently skipping tree-conflicted externals.
Sorry if this is a stupid question (I have no clue of how this is
done), but I just wondered: will looking only at the parent directory
(and not further up the hierarchy) also be sufficient to handle tree
conflicts inside sub-sub-... directories of externals?
Cheers,
--
Johan
Received on 2010-05-19 12:48:15 CEST