[PATCH 1 of 2] largefiles: don't clobber merge action message with user message

[Martin von Zweigbergk]

On Wed Dec 03 2014 at 7:52:51 PM Mads Kiilerich <mads at kiilerich.com> wrote:

> On 12/03/2014 08:45 PM, Martin von Zweigbergk wrote:
> > # HG changeset patch
> > # User Martin von Zweigbergk <martinvonz at google.com>
> > # Date 1416599097 28800
> > #      Fri Nov 21 11:44:57 2014 -0800
> > # Node ID e615814e438cbe0254d89252e4f1ad385baac022
> > # Parent  fc76f55705eb5884707c977ecb756aee7c794676
> > largefiles: don't clobber merge action message with user message
> >
> > The message in the action is used for debugging and should not be the
> > same as the question presented to the user. Use a different variable
> > for the user message, so the 'msg' variable already in scope does not
> > get overwritten.
> >
> > diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.
> py
> > --- a/hgext/largefiles/overrides.py
> > +++ b/hgext/largefiles/overrides.py
> > @@ -437,7 +437,7 @@
> >               # the second parent
> >               lfile = splitstandin
> >               standin = f
> > -            msg = _('remote turned local normal file %s into a
> largefile\n'
> > +            usermsg = _('remote turned local normal file %s into a
> largefile\n'
> >                       'use (l)argefile or keep (n)ormal file?'
> >                       '$$ &Largefile $$ &Normal file') % lfile
>
> Adjust indentation?
>

Yes, sorry. Maybe Pierre-Yves is nice enough to fix that in flight?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20141204/5aa5de40/attachment.html>