You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Karl Fogel <kf...@red-bean.com> on 2008/02/05 05:50:28 UTC

Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

kfogel@tigris.org writes:
> --- trunk/subversion/svn/conflict-callbacks.c	(original)
> +++ trunk/subversion/svn/conflict-callbacks.c	Mon Feb  4 21:32:46 2008
> @@ -378,10 +390,12 @@
>  
>            prompt = apr_pstrdup(subpool, _("Select: (p)ostpone"));
>            if (diff_allowed)
> -            prompt = apr_pstrcat(subpool, prompt, _(", (d)iff, (e)dit"),
> +            prompt = apr_pstrcat(subpool, prompt,
> +                                 _(", (D)iff-all, (e)dit"),
>                                   NULL);
>            else
> -            prompt = apr_pstrcat(subpool, prompt, _(", (m)ine, (t)heirs"),
> +            prompt = apr_pstrcat(subpool, prompt,
> +                                 _(", (M)ine-all, (T)heirs-all"),
>                                   NULL);
>            if (performed_edit)
>              prompt = apr_pstrcat(subpool, prompt, _(", (r)esolved"), NULL);

This is the one part of the change I worry about: the addition of the
"-all" suffix to in the 'mine' and 'theirs' cases can make that prompt
go longer than 80 columns:

   Select: (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:

One solution would be to put the "Select:" on a line by itself.  The
two possible prompts would then look like this:

   Select:
    (p)ostpone, (D)iff-all, (e)dit, (r)esolved, (h)elp for more options:

   Select:
    (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:

That would even give us room to be a bit less terse...

   Select one of the following:
    (p)ostpone, (D)iff-all, (e)dit, (r)esolved, (h)elp for more options:

   Select one of the following:
    (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:

...or something.  Or maybe someone has another solution; anyway, I
wanted to call this out and see what people think.  People, what do
you think?

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

Posted by Karl Fogel <kf...@red-bean.com>.
Branko Čibej <br...@xbc.nu> writes:
> "Don't worry about the 80-column limit too much here"
> "Off-topic: we could tweak such things in message catalogs if we had
> an en.po"

Gotcha, thanks :-).

Good point about the 80-column limit.

I have various questions about the en.po idea, but am not going to
start that thread now, only because working on other stuff.  What was
good enough for grandpa is good enough for me, at least for now.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org


Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

Posted by Branko Čibej <br...@xbc.nu>.
Karl Fogel wrote:
> Branko Čibej <br...@xbc.nu> writes:
>   
>> Karl Fogel wrote:
>>     
>>> Eric Gillespie <ep...@pretzelnet.org> writes:
>>>       
>>>>> This is the one part of the change I worry about: the addition of the
>>>>> "-all" suffix to in the 'mine' and 'theirs' cases can make that prompt
>>>>> go longer than 80 columns:
>>>>>
>>>>>    Select: (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:
>>>>>       
>>>>>           
>>>> Well, these "all" options are not going to be here much longer,
>>>> right?  They'll be relegated to "more options" once we have the
>>>> new mine/theirs.  So why worry about it?
>>>>         
>>> Yes, that's true.  But 1.6 isn't happening tomorrow, either; I think
>>> it's worth paying attention to presentation for as long as 1.5.x is
>>> the latest.
>>>       
>> With all the translations that have to deal with this, I'd say this is
>> trivial. Also I think we should have an .po file for English because
>> it's easier to fix typos and things in a translation than in the code.
>>     
>
> I'm not sure which way you're advocating, Brane.  The first half of
> your first sentence seems to contradict the second (but I might be
> misunderstanding).  And I'm not sure what the second sentence has to
> do with the general topic of this thread, although it's an interesting
> idea in its own right.
>
> ??
>   

Mrgfl, i should get more sleep.

"Don't worry about the 80-column limit too much here"
"Off-topic: we could tweak such things in message catalogs if we had an 
en.po"

Sorry.

-- Brane

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

Posted by Karl Fogel <kf...@red-bean.com>.
Branko Čibej <br...@xbc.nu> writes:
> Karl Fogel wrote:
>> Eric Gillespie <ep...@pretzelnet.org> writes:
>>>> This is the one part of the change I worry about: the addition of the
>>>> "-all" suffix to in the 'mine' and 'theirs' cases can make that prompt
>>>> go longer than 80 columns:
>>>>
>>>>    Select: (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:
>>>>       
>>> Well, these "all" options are not going to be here much longer,
>>> right?  They'll be relegated to "more options" once we have the
>>> new mine/theirs.  So why worry about it?
>>
>> Yes, that's true.  But 1.6 isn't happening tomorrow, either; I think
>> it's worth paying attention to presentation for as long as 1.5.x is
>> the latest.
>
> With all the translations that have to deal with this, I'd say this is
> trivial. Also I think we should have an .po file for English because
> it's easier to fix typos and things in a translation than in the code.

I'm not sure which way you're advocating, Brane.  The first half of
your first sentence seems to contradict the second (but I might be
misunderstanding).  And I'm not sure what the second sentence has to
do with the general topic of this thread, although it's an interesting
idea in its own right.

??

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org


Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

Posted by Branko Čibej <br...@xbc.nu>.
Karl Fogel wrote:
> Eric Gillespie <ep...@pretzelnet.org> writes:
>   
>>> This is the one part of the change I worry about: the addition of the
>>> "-all" suffix to in the 'mine' and 'theirs' cases can make that prompt
>>> go longer than 80 columns:
>>>
>>>    Select: (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:
>>>       
>> Well, these "all" options are not going to be here much longer,
>> right?  They'll be relegated to "more options" once we have the
>> new mine/theirs.  So why worry about it?
>>     
>
> Yes, that's true.  But 1.6 isn't happening tomorrow, either; I think
> it's worth paying attention to presentation for as long as 1.5.x is
> the latest.
>   

With all the translations that have to deal with this, I'd say this is 
trivial. Also I think we should have an .po file for English because 
it's easier to fix typos and things in a translation than in the code.

-- Brane

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

Posted by Karl Fogel <kf...@red-bean.com>.
Eric Gillespie <ep...@pretzelnet.org> writes:
>> Yes, that's true.  But 1.6 isn't happening tomorrow, either; I think
>> it's worth paying attention to presentation for as long as 1.5.x is
>> the latest.
>
> Ah, 1.6!  I somehow thought you were going to be adding the new
> features soon.  Let's not knowingly go past 80 columns with that
> prompt in a formal release.
>
> This doesn't look too bad:
>
> Select:
> (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:
>
> but how about:
>
> Select: (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved,
>         (h)elp for more options:
>
> I'm not going to bikeshed it; it doesn't really matter.  Let's
> just break it in two lines somehow, as we can do it cleanly, but
> terminal emulators cannot :).

I'll come up with something, no problem :-).

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

Posted by David Glasser <gl...@davidglasser.net>.
On Feb 5, 2008 1:26 PM, C. Michael Pilato <cm...@collab.net> wrote:
> If we're wrapping lines anyway, I'd really prefer to make full use of
> grammar here.  Something like:
>
>     Select: (p)ostpone, all of (M)ine, all of (T)heirs, (r)esolved,
>             (h)elp for more options:
>
> "(M)ine-all" and "(T)heirs-all" is so ... inhuman.

Select: (p)ostpone, all of (M)ine, why not take all of (M)ine...

--dave


-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

Posted by Eric Gillespie <ep...@pretzelnet.org>.
"C. Michael Pilato" <cm...@collab.net> writes:

> If we're wrapping lines anyway, I'd really prefer to make full use of 
> grammar here.  Something like:
> 
>     Select: (p)ostpone, all of (M)ine, all of (T)heirs, (r)esolved,
>             (h)elp for more options:

Even better!

-- 
Eric Gillespie <*> epg@pretzelnet.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

Posted by "C. Michael Pilato" <cm...@collab.net>.
Eric Gillespie wrote:
> Karl Fogel <kf...@red-bean.com> writes:
> 
>> Eric Gillespie <ep...@pretzelnet.org> writes:
>>>> This is the one part of the change I worry about: the addition of the
>>>> "-all" suffix to in the 'mine' and 'theirs' cases can make that prompt
>>>> go longer than 80 columns:
>>>>
>>>>    Select: (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:
>>> Well, these "all" options are not going to be here much longer,
>>> right?  They'll be relegated to "more options" once we have the
>>> new mine/theirs.  So why worry about it?
>> Yes, that's true.  But 1.6 isn't happening tomorrow, either; I think
>> it's worth paying attention to presentation for as long as 1.5.x is
>> the latest.
> 
> Ah, 1.6!  I somehow thought you were going to be adding the new
> features soon.  Let's not knowingly go past 80 columns with that
> prompt in a formal release.
> 
> This doesn't look too bad:
> 
> Select:
> (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:
> 
> but how about:
> 
> Select: (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved,
>         (h)elp for more options:

If we're wrapping lines anyway, I'd really prefer to make full use of 
grammar here.  Something like:

    Select: (p)ostpone, all of (M)ine, all of (T)heirs, (r)esolved,
            (h)elp for more options:

"(M)ine-all" and "(T)heirs-all" is so ... inhuman.

-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand


Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

Posted by Eric Gillespie <ep...@pretzelnet.org>.
Karl Fogel <kf...@red-bean.com> writes:

> Eric Gillespie <ep...@pretzelnet.org> writes:
> >> This is the one part of the change I worry about: the addition of the
> >> "-all" suffix to in the 'mine' and 'theirs' cases can make that prompt
> >> go longer than 80 columns:
> >> 
> >>    Select: (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:
> >
> > Well, these "all" options are not going to be here much longer,
> > right?  They'll be relegated to "more options" once we have the
> > new mine/theirs.  So why worry about it?
> 
> Yes, that's true.  But 1.6 isn't happening tomorrow, either; I think
> it's worth paying attention to presentation for as long as 1.5.x is
> the latest.

Ah, 1.6!  I somehow thought you were going to be adding the new
features soon.  Let's not knowingly go past 80 columns with that
prompt in a formal release.

This doesn't look too bad:

Select:
(p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:

but how about:

Select: (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved,
        (h)elp for more options:

I'm not going to bikeshed it; it doesn't really matter.  Let's
just break it in two lines somehow, as we can do it cleanly, but
terminal emulators cannot :).

-- 
Eric Gillespie <*> epg@pretzelnet.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

Posted by Karl Fogel <kf...@red-bean.com>.
Eric Gillespie <ep...@pretzelnet.org> writes:
>> This is the one part of the change I worry about: the addition of the
>> "-all" suffix to in the 'mine' and 'theirs' cases can make that prompt
>> go longer than 80 columns:
>> 
>>    Select: (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:
>
> Well, these "all" options are not going to be here much longer,
> right?  They'll be relegated to "more options" once we have the
> new mine/theirs.  So why worry about it?

Yes, that's true.  But 1.6 isn't happening tomorrow, either; I think
it's worth paying attention to presentation for as long as 1.5.x is
the latest.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r29189 - in trunk/subversion: include libsvn_wc svn tests/cmdline tests/cmdline/getopt_tests_data

Posted by Eric Gillespie <ep...@pretzelnet.org>.
Karl Fogel <kf...@red-bean.com> writes:

> This is the one part of the change I worry about: the addition of the
> "-all" suffix to in the 'mine' and 'theirs' cases can make that prompt
> go longer than 80 columns:
> 
>    Select: (p)ostpone, (M)ine-all, (T)heirs-all, (r)esolved, (h)elp for more options:

Well, these "all" options are not going to be here much longer,
right?  They'll be relegated to "more options" once we have the
new mine/theirs.  So why worry about it?

-- 
Eric Gillespie <*> epg@pretzelnet.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org