[PATCH] merge: give hint as to how to discover uncommitted changes

[Matt Mackall]

On Fri, 2009-05-22 at 19:07 +0200, Martin Geisler wrote:
> Steve Borho <steve at borho.org> writes:
> 
> > # HG changeset patch
> > # User Steve Borho <steve at borho.org>
> > # Date 1243010541 18000
> > # Node ID 257ecdc9c2e9bbebb73aa2e25b59c3c10b11c88d
> > # Parent  90f86a5330bbbcd075c792cd14fb6bb47b8ccd2c
> > merge: give hint as to how to discover uncommitted changes
> >
> > Many users will try 'hg diff' here, and it will not show them missing files.
> >
> > diff -r 90f86a5330bb -r 257ecdc9c2e9 mercurial/merge.py
> > --- a/mercurial/merge.py	Mon May 18 17:36:24 2009 -0500
> > +++ b/mercurial/merge.py	Fri May 22 11:42:21 2009 -0500
> > @@ -455,7 +455,8 @@
> >                      raise util.Abort(_("nothing to merge (use 'hg update'"
> >                                         " or check 'hg heads')"))
> >              if not force and (wc.files() or wc.deleted()):
> > -                raise util.Abort(_("outstanding uncommitted changes"))
> > +                raise util.Abort(_("outstanding uncommitted changes, "
> > +                                   "(use 'hg status' to see changes)"))
> 
> I think this sounds like a good idea, and since we're just appending to
> an old message we can hope that old scripts wont notice the change.

I prefer either "use 'hg status' to list changes" or "see 'hg status'".

-- 
http://selenic.com : development and support for Mercurial and Linux