Request for rebaseif extension to be provided by default with rebase

Pierre-Yves David pierre-yves.david at logilab.fr
Tue Jun 21 06:17:34 CDT 2011


On Tue, Jun 21, 2011 at 12:26:56PM +0200, Martin Geisler wrote:
> Pierre-Yves David <pierre-yves.david at logilab.fr> 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:

You can detecte some conflict with a computer. you can't detect there is None.

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

We are not talking abotu rebaseif anymore but about automatic merge-gommit//rebase on fetch

> > 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 :)

Rebase should never be used **blindy**.

-- 
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/20110621/c2d86a45/attachment.pgp>


More information about the Mercurial mailing list