Request for rebaseif extension to be provided by default with rebase

Sébastien Deleuze seb at deleuze.fr
Fri Jun 17 07:20:49 CDT 2011


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 ...

On Thu, May 26, 2011 at 7:21 PM, Adrian Buehlmann <adrian at cadifra.com>wrote:

> On 2011-05-25 14:06, Sébastien Deleuze wrote:
> > Sorry I missed this mail and Marcus previous one.
> > I think the behaviour introduced by this patch is perfect !
>
> This patch was now rejected by Matt here:
>
> http://selenic.com/pipermail/mercurial-devel/2011-May/031895.html
>
> So -- unless someone comes up with a different proposal -- you are left
> with the status quo: Use your rebaseif extension and you have to
> maintain and distribute it yourself.
>
> > On Wed, May 25, 2011 at 12:38 PM, Adrian Buehlmann <adrian at cadifra.com>
> wrote:
> >> On 2011-05-25 12:26, Sébastien Deleuze wrote:
> >>> I agree, it would be even better if abort could be the default
> >>> behaviour for "hg pull --rebase" since fallback to pure "hg pull" in
> >>> case of conflicts make sense from my point of view.
> >>>
> >>> On Wed, May 25, 2011 at 11:58 AM, Marcin Kasperski
> >>> <Marcin.Kasperski at mekk.waw.pl> wrote:
> >>>>> [rebase]
> >>>>> onconflict=interrupt (default), abort or abortAndMerge
> >>>>>
> >>>>> - interrupt : interrupt and let the repository in a REBASING state
> >>>>> (current behaviour)
> >>>>> - abort : abort (behaviour I prefer). I case of hg pull --rebase, it
> >>>>> means that in case of rebase conflict, it will be equivalent to a
> >>>>> simple hg pull
> >>>>> - abortAndMerge : abort and run a merge (current rebaseif behaviour)
> >>>>>
> >>>>> And maybe some command ligne option like hg rebase --abortonconflict
> >>>>
> >>>> Nice idea IMHO. Even better if 'abort' could be default....
> >>
> >> Has anyone of you guys looked at my rebase patch
> >>
> >> diff --git a/hgext/rebase.py b/hgext/rebase.py
> >> --- a/hgext/rebase.py
> >> +++ b/hgext/rebase.py
> >> @@ -570,6 +570,7 @@
> >>             commands.postincoming = origpostincoming
> >>         revspostpull = len(repo)
> >>         if revspostpull > revsprepull:
> >> +            opts['tool'] = "internal:fail"
> >>             rebase(ui, repo, **opts)
> >>             branch = repo[None].branch()
> >>             dest = repo[branch].rev()
> >>
> >> and the associated example usage scenario I mentioned in this thread
> here:
> >>
> >> http://www.selenic.com/pipermail/mercurial/2011-May/038474.html
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20110617/7589f25c/attachment.htm>


More information about the Mercurial mailing list