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

Re: svn commit: r40424 - trunk/subversion/libsvn_wc

From: Neels Janosch Hofmeyr <neels_at_elego.de>
Date: Tue, 10 Nov 2009 23:39:23 +0100

Greg Stein wrote:
> On Sun, Nov 8, 2009 at 16:40, Neels Janosch Hofmeyr <neels_at_elego.de> wrote:
>> Author: neels
>> Date: Sun Nov 8 13:40:39 2009
>> New Revision: 40424
>>
>> Log:
>> wc-ng: Remove use of svn_wc_entry_t from tree-conflict detection during update.
>> Keep the outcome identical, avoid fixing.
>>
>> Changes in behavior are pending and discussed on dev@:
>> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2415071
>> Subject: Re: wc-ng patch review
>> Date: Fri, 06 Nov 2009 11:43:05 +0000
>> Message-ID: <1257507785.8865.46.camel_at_edith.foad.me.uk>
>>
>> * subversion/libsvn_wc/update_editor.c
>> (SVN_WC_CONFLICT_REASON_NONE): New local #define.
>> (get_node_working_state, get_node_uri):
>> New static functions, for check_tree_conflict().
>
> What? Didn't you catch my reply that get_node_uri() is DUPLICATE
> functionality to svn_wc__internal_get_node_url() ??

Sorry, apparently not. I'll follow up in a short while.

~Neels

>
>> ... (unreviewed so far) ...
>
> Cheers,
> -g
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2415782

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2416301

Received on 2009-11-10 23:40:12 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.