Request for rebaseif extension to be provided by default with rebase

Martin Geisler mg at
Tue Jun 21 05:26:56 CDT 2011

Pierre-Yves David <pierre-yves.david at> writes:

> On Tue, Jun 21, 2011 at 11:45:11AM +0200, Sébastien Deleuze wrote:
>> Is there a better way that could allow hg pull to print me if there
>> is conflicts or not between my local and the remote changes when
>> pulling them ?
> As said in a previous email, real world conflict can't be detected by
> a computer.

It is actually irrelevant if conflicts can be detected by a computer:
there is no difference between doing:

  $ hg merge
  $ hg commit


  $ hg rebase

when there are no (textual) conflicts. In both cases, it is up to the
developer to take a look at the result and verify that things still make

I think the rebaseif functionality is nice: it gives people an easy way
to avoid empty merge changesets.

> Rebase should never be used blindy.

We rebase blindly all the time when we apply patches sent to us by
email. I rebase as a rule before pushing to crew: I look briefly at the
resulting changesets and run the test suite. If it passes, then I'm
happy to push the changesets.

There is no need to pretend that we don't rebase all the time :)

Martin Geisler

aragost Trifork
Professional Mercurial support

More information about the Mercurial mailing list