Request for rebaseif extension to be provided by default with rebase
Adrian Buehlmann
adrian at cadifra.com
Wed May 25 10:38:58 UTC 2011
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
?
More information about the Mercurial
mailing list