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

Re: svn commit: r1398147 - /subversion/trunk/subversion/svn/conflict-callbacks.c

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 15 Oct 2012 11:48:53 +0200

On Sun, Oct 14, 2012 at 11:20:48PM -0000, danielsh_at_apache.org wrote:
> Author: danielsh
> Date: Sun Oct 14 23:20:48 2012
> New Revision: 1398147
>
> URL: http://svn.apache.org/viewvc?rev=1398147&view=rev
> Log:
> Easter egg.
>
> * subversion/svn/conflict-callbacks.c
> (handle_text_conflict): Use ASCII art rather than :-[A-Z].
>
> Modified:
> subversion/trunk/subversion/svn/conflict-callbacks.c
>
> Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1398147&r1=1398146&r2=1398147&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
> +++ subversion/trunk/subversion/svn/conflict-callbacks.c Sun Oct 14 23:20:48 2012
> @@ -477,7 +477,8 @@ handle_text_conflict(svn_wc_conflict_res
> if (performed_edit)
> knows_something = TRUE;
> }
> - else if (strcmp(answer, "m") == 0 || strcmp(answer, ":-M") == 0)
> + else if (strcmp(answer, "m") == 0 || strcmp(answer, "=>-") == 0
> + || strcmp(answer, ":>.") == 0)
> {
> if (desc->kind != svn_wc_conflict_kind_text)
> {
>

What's wrong with :-[A-Z]? You didn't explain that in the log message.

There are more cases of :-[A-Z] which your patch doesn't change.
If the motivation is to get rid of those, why aren't you doing so
in a consistent way?

I don't understand what =>- and :>. are supposed to represent. They look
like parts of an ASCII art animation of a tumbling Felix Baumgartner rather
than smilies. The :-M is not pretty either of course but I'm not sure what
else to use. My list of suggestions would be: :-# :-@ :-O :-x
I'd like to keep the :- prefix for consistency. All smilies we have so
far use - for the nose.

It feels good to argue about something entirely pointless for a change :)
Received on 2012-10-15 11:49:33 CEST

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