[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Tree conflicts - revert and resolve per victim

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 06 Nov 2008 21:22:02 +0000

On Thu, 2008-11-06 at 07:03 +0100, Neels J. Hofmeyr wrote:
>
> Julian Foad wrote:
> > [[[
> > CMD: svn resolved -R branch2/dP [...]
> > Resolved conflicted state of 'branch2/dP'
> > ### Deleted: resolve_f_e_cb('branch2/dP/D')
> > svn: warning: Directory 'branch2/dP/D' is missing
> > ]]]
> >
> > I haven't investigated what causes this output yet. I'm just posting
> > this so you can look if you're working while I'm asleep (Neels!).
>
> I've found this:
>
[...]
> So it's the adm_retrieve in:
> subversion/libsvn_wc/entries.c:3199
> SVN_ERR(walk_callbacks->handle_error
> (entrypath,
> svn_wc_adm_retrieve(&entry_access, adm_access, entrypath,
> ^^^^^^^^^^^^^^^^^^^ subpool),
> walk_baton, pool));

Thanks. I identified a bug in svn_wc_walk_entrie3(...
show_hidden=TRUE...), fixed in r34084.

> I also found another one of those error messages when trying to reproduce
> yours, in walk.sh.txt.
>
> This one is here:
>
> #0 svn_wc_adm_retrieve (adm_access=0xbff25e9c, associated=0x81f58e0,
> path=0x81eb038 "bar/modified_dir", pool=0x81f5858)
> at subversion/libsvn_wc/lock.c:1030
> #1 0x080a0c00 in resolve_found_entry_callback (
> path=0x81eb038 "bar/modified_dir", entry=0x81e2000, walk_baton=0x81f5920,
> pool=0x81f5858) at subversion/libsvn_wc/adm_ops.c:2907
> #2 0x080ad355 in visit_tc_too_found_entry (path=0x81eb038 "bar/modified_dir",
> entry=0x81e2000, walk_baton=0xbff26018, pool=0x81f5858)
> at subversion/libsvn_wc/entries.c:3294
> #3 0x080acebc in walker_helper (dirpath=0x81eb038 "bar/modified_dir",
> adm_access=0x81f58e0, walk_callbacks=0x819f188, walk_baton=0xbff26018,
> depth=svn_depth_infinity, show_hidden=1,
> cancel_func=0x8055fd1 <svn_cl__check_cancel>, cancel_baton=0x0,
> pool=0x81f5858) at subversion/libsvn_wc/entries.c:3150
> #4 0x080ad294 in svn_wc_walk_entries3 (path=0x81eb038 "bar/modified_dir",
> adm_access=0x81f58e0, walk_callbacks=0x819f188, walk_baton=0xbff26018,
> depth=svn_depth_infinity, show_hidden=1,
> cancel_func=0x8055fd1 <svn_cl__check_cancel>, cancel_baton=0x0,
> pool=0x81f5858) at subversion/libsvn_wc/entries.c:3257
> #5 0x080ad657 in svn_wc__walk_entries_and_tc (
> path=0x81eb038 "bar/modified_dir", adm_access=0x81f58e0,
> walk_callbacks=0x819e658, walk_baton=0x81f5920, depth=svn_depth_infinity,
> cancel_func=0x8055fd1 <svn_cl__check_cancel>, cancel_baton=0x0,
>
>
> So it's this one:
> subversion/libsvn_wc/adm_ops.c:2907
> /* Figger out the directory in which the conflict resides. */
> if (entry->kind == svn_node_dir)
> conflict_dir = path;
> else
> svn_path_split(path, &conflict_dir, &base_name, pool);
> SVN_ERR(svn_wc_adm_retrieve(&adm_access, baton->adm_access, conflict_dir,
> pool));
> ^^^^^^^^^^^^^^^^^^^
>
> I'm not sure whether this second case is omitting a message it should print.
> Now it's also bedtime for me. So I'll leave all else to you :)

I haven't looked at this one yet.

- 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-06 22:22:25 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.