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

[Stefan Sperling <st...@elego.de>]

On Sun, Oct 14, 2012 at 11:20:48PM -0000, danielsh@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 :)

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

["C. Michael Pilato" <cm...@collab.net>]

On 10/15/2012 05:48 AM, Stefan Sperling wrote:
> It feels good to argue about something entirely pointless for a change :)

Indeed.  You guys aren't even painting the bikeshed siding.  You're painting
the roofing sheets -- which will be immediately and completely covered with
tar paper and shingles -- on the bikeshed.

-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development