[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mercurial
Subject:    Re: [PATCH] do not abort with 'update -m',	uncommited changes and
From:       Christian Boos <cboos () neuf ! fr>
Date:       2006-01-31 8:54:52
Message-ID: 43DF25DC.3070905 () neuf ! fr
[Download RAW message or body]

Benoit Boissinot wrote:
> it looks like some people always use '-m' with update,
> this patch makes the new behaviour of '-m' with uncommited
> changes less annoying. (i still think they should use
> update -m only for real merge)

It looks like a lot of people (me :) ) would love to have an explicit 
'hg merge'...

By the time, I got used to the mercurial usages, but I would find
the following user interface *much* more user friendly and clearer:
 * 'hg merge' instead of 'hg update -m'
 * 'hg checkout' instead of 'hg update -C'
 * 'hg update' does only the 'hg update', nothing more.

'-f' could apply to all of the above.

What do you think?

-- Christian

_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial
[prev in list] [next in list] [prev in thread] [next in thread]