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

Re: [PATCH] proper indentation in merge conflict menu

From: Daniel Shahaf <d.s_at_daniel.shahaf.co.il>
Date: Fri, 6 Jun 2008 06:49:49 +0300 (Jerusalem Daylight Time)

David Glasser wrote on Thu, 5 Jun 2008 at 20:06 -0700:
> We could just indent a fixed number of spaces, like one or two.
>

And add a linebreak between "Select: " and the first option:

- Select: (p) postpone
- (i) indented second line
+ Select:
+ (p) postpone
+ (i) indented second line

> Or we could translate the entire multi-line message, though that would
> require making the code flow differently.
>
> --dave
>
> On Thu, Jun 5, 2008 at 6:31 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> > On Thu, Jun 05, 2008 at 06:17:17PM -0400, Karl Fogel wrote:
> >> Whoa, whoa, whoa. Let's slow down and think about this carefully.
> >>
> >> I'm not sure r31600 is a generally applicable solution. After all, a
> >> translation might be longer instead of shorter.
> >>
> >> Instead, perhaps we have to write multiline prompts in a way that allows
> >> translations to work regardless of word length. I don't think counting
> >> characters is the way to go, unless there's no other solution.
> >
> > Regardless of whether or not we're going to count characters,
> > here's a diff that does the counting properly, just to illustrate
> > how this could be done.
> >
> > I *really* hope someone has a better idea. The amount of hoops
> > this patch has to jump through is a bit crazy. Maybe there's also
> > a way of doing this without wide chars, but I don't know how.
> >

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-06 05:50:07 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.