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

Re: [PATCH] fix comment for svn_wc_conflicted_p()

From: Neels Hofmeyr <neels_at_elego.de>
Date: Sun, 24 Aug 2008 04:44:22 +0200

Karl Fogel wrote:
> Neels Hofmeyr <neels_at_elego.de> writes:
>> Hi dev,
>>
>> The comment for
>>
>> subversion/include/svn_wc.h (svn_wc_conflicted_p)
>>
>> is both misleading and incomplete.
>>
>> Quoting the comment:
>> "
>> /** Given a @a dir_path under version control, decide if one of its
>> * entries (@a entry) is in state of conflict; return the answers in
>> * @a text_conflicted_p and @a prop_conflicted_p.
>> *
>> * (If the entry mentions that a .rej or .prej exist, but they are
>> * both removed, assume the conflict has been resolved by the user.)
>> */
>> "
>>
>> 1) It does not mention that .rej and .prej refer to file suffixes.
>
> Oddly enough, your patch did not specifically say they refer to file
> suffixes either. I tweaked it before committing in r32665.

Lol, I assumed *that* much I can expect from the reader. Needless to say
you're right.

Thanks!

~Neels

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194

Received on 2008-08-24 04:44:51 CEST

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.