Re: [Fwd: svn commit: r34133 - in branches/tc-resolve/subversion: include libsvn_client libsvn_wc]

On Tue, 2008-11-11 at 05:26 +0100, Neels J. Hofmeyr wrote:
> Hey Julian,
>
> I've gotten as far as none of the tree_conflicts tests failing anymore. But
> could you please closely review these two things:
>
> 1
> [[[
> * subversion/libsvn_client/resolved.c
> (svn_client_resolve):
> Get the ADM_ACCESS on the target's parent directory to be able to resolve
> tree-conflicted directories. Extend the ADM_LOCK_LEVEL to still be able
> to lock the target node for text/prop conflicts.

Levels '0' and '1' both need extending, not just '0'. (And levels can go
higher than 1, so 1 can go to 2 and doesn't have to become infinite.)

+ /* In order to resolve tree-conflicts on the target PATH, we need an
+ * adm_access on its parent directory. The lock level then needs to
extend
+ * at least onto the immediate children. */
+ if (adm_lock_level == 0)
+ adm_lock_level = 1;

if (adm_lock_level >= 0)
    adm_lock_level++;

+ SVN_ERR(svn_wc_adm_probe_open3(&adm_access, NULL,
+ svn_path_dirname(path, pool),

(I needed to #include "svn_path.h" for svn_path_dirname().)

                                  TRUE,
                                  adm_lock_level,
                                  ctx->cancel_func, ctx->cancel_baton,
                                  pool));

Then I found that recursive resolves go wrong. After adjusting
commit_tests 60 to work with per-victim resolve, it successfully
resolves when it names the three victims as separate targets, but it
fails in recursive mode:

[[[
svn resolved .../A/D/G -R
svn: warning: Directory '.../A/D/G/G' is missing
]]]

I'll commit this much and then look further.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-11 16:09:13 CET