Request for rebaseif extension to be provided by default with rebase

[Pierre-Yves David]

On Fri, Jun 17, 2011 at 02:20:49PM +0200, Sébastien Deleuze wrote:
> Ok feedbacks about patch are right there is an issue with it.
> But I think the question about resbaseif like functionnality is still here.
> 
> This functionnality is not only for begginers coming from SVN asking for a
> command like svn update, GIT users are not less hardcore DVCS users than
> Mercurial ones and have fast forward merge when they do a git pull. This
> functionnality is used every day by thousands and thousands of very
> experienced DVCS users.
> 
> I think that having nothing  (even as an option) to have a similar behaviour
> than Git fast forward merges is a real issue if we want Mercurual to be more
> widely use I think.
> 
> hg fetch is a bad way to acheive this, this one is a lot cleaner ...

I don't understand how your email fit in the current topic,

People can already to "pull" and "update" in the same operation with `hg pull
-u` (and hg pull --rebase). The topic was about: provide a way to use rebase if
there are no conflict and explicit merge when there are conflict.

About joining both operations:

Splitting the "pull" and the "update" operations is good practice in my
opinion. A kiln guy once referred to a distinction between "exchanging" changes
and "inflicting" changes.

I believe git does both operation together by default as they were more
restricted by they "everything should be a labeled head". Having clean
definition of remotes head allow git to also have a "fetch" command that result
with several heads with the same name (distinct thanks remotes/heads)

As you can see `hg rebase` as an advanced version of `hg update` with
uncommitted change. I used "update" for both `hg update` and `hg rebase`.


-- 
Pierre-Yves David

http://www.logilab.fr


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial/attachments/20110617/2bb06b22/attachment.pgp>