##// END OF EJS Templates
rebase: restrict rebase destination to the pulled set (issue5214)...
rebase: restrict rebase destination to the pulled set (issue5214) Before this patch, `hg pull --rebase` would be a strict sequence of `hg pull` followed by `hg rebase` if anything was pulled. Now that rebase pick his default destination the same way than merge, than `hg rebase` step would abort in the case the repo already had multiple anonymous heads (because of the ambiguity). (changed in fac3a24be50e) The intend of the user with `hg pull --rebase` is clearly to rebase on pulled content. This used to be (mostly) enforced by the former default destination for rebase, "tipmost changeset of the branch" as the tipmost would likely a changeset that just got pulled. But this intended was no longer enforced with the new defaul destination (unified with merge). This changeset makes use of the '_destspace' mechanism introduced in the previous changeset to enforce this. This partially fixes issue5214 as no change at all have been made to the new handling of the case with bookmark (unified with merge).

File last commit:

r19617:ba89c387 default
r29044:261c2537 stable
Show More
9diff.rc
7 lines | 192 B | text/x-stsrc | TextLexer
Steven Stallion
plan9: finalize documentation for next release
r16442 # The 9diff extdiff command generates diff(1) compatible output
# suitable for use with the plumber(4).
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 [extensions]
extdiff =
[extdiff]
Jeff Sickel
hgrc.d: separate namespace for mercurial scripts 9diff and 9mail
r19617 9diff = /bin/mercurial/9diff -cm $parent $child $root