On Thu, 2008-11-20 at 14:22 +0000, Julian Foad wrote:
> On Thu, 2008-11-20 at 06:14 +0100, Neels J. Hofmeyr wrote:
> > [[[
> > Index: subversion/libsvn_wc/update_editor.c
> > ===================================================================
> > --- subversion/libsvn_wc/update_editor.c (revision 34272)
> > +++ subversion/libsvn_wc/update_editor.c (working copy)
> > @@ -1391,18 +1391,21 @@ check_tree_conflict(svn_wc_conflict_desc
> > svn_wc_conflict_action_t action,
> > apr_pool_t *pool)
> > {
> > + svn_node_kind_t their_node_kind = svn_node_unknown;
> > svn_wc_conflict_reason_t reason = (svn_wc_conflict_reason_t)(-1);
> >
> > switch (action)
> > {
> > case svn_wc_conflict_action_edit:
> > /* Use case 1: Modifying a locally-deleted item. */
> > + /* ### their_node_kind = ?; */
> > ]]]
> >
> > Hmm! That's a good question.
This bit, I haven't investigated yet.
> > I'm sorry, my time's up for today. So let's all use the branch and schaukel
> > this baby.
>
> I'll continue.
OK, I've done a chunk of the rest of it: merge fills in the data nicely,
it gets stored in the WC, and "svn info" prints it. If you'd like to
have a go at some more tonight, be my guest.
- 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-21 02:20:16 CET