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

Re: Bug or feature: added file with conflict not shown as conflict

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-05-21 19:49:12 CEST

On May 11, 2005, at 12:54 PM, Philip Martin wrote:

> Julian Foad <julianfoad@btopenworld.com> writes:
>
>
>> Ping! Can anyone comment?
>>
>> - Julian
>>
>>
>> Norbert Unterberg wrote:
>>
>>> Today I fell over some strange behaviour with TortoiseSVN, so I
>>> retried the operations with SVN and got the same results.
>>> When you have an added file that has a non-resolved conflict, the
>>> conflicted state is not shown. This state can happen when you merge
>>> changes from one branch to another.
>>>
>
> Yes, I tend to agree that we should show 'C' rather than 'A'.
>
> The svn_wc_status_kind enum makes svn_wc_status_conflicted and
> svn_wc_status_added mutually exclusive, and svn_wc_status prefers add
> over conflicted. I suppose we could reverse that to make
> svn_wc_status prefer conflicted over add, then the client would show
> 'C' rather than 'A'.
>
> It might be better to add a new enum value to indicate both added and
> conflicted, and let the caller make the decision about how to display
> it (potentially showing some currently unused letter). I'm not sure
> whether that would qualify as an ABI change, old clients would get a
> value they don't know how to interpret e.g. a 1.2 svn binary using
> such a library would show '?'.

Should we file this as a bug? It seems like it to me.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat May 21 19:51:04 2005

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