[Bug 5214] New: `hg pull --rebase` doesn't work if I don't use bookmarks/topics/whatever.
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Tue Apr 19 21:00:48 UTC 2016
https://bz.mercurial-scm.org/show_bug.cgi?id=5214
Bug ID: 5214
Summary: `hg pull --rebase` doesn't work if I don't use
bookmarks/topics/whatever.
Product: Mercurial
Version: 3.8-rc
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: rebase
Assignee: bugzilla at selenic.com
Reporter: hg at pewpew.net
CC: mercurial-devel at selenic.com
Created attachment 1916
--> https://bz.mercurial-scm.org/attachment.cgi?id=1916&action=edit
repro script, 3.8-rc+9 output, 3.7.3 output.
A recent change (february, if I remember my conversation with marmoute
correctly) to attempt to unify zero-argument merge/rebase behavior seems to
have broken my workflow for `hg pull --rebase`.
Things to note:
1: I don't use bookmarks, topics, named branches, etc.
2: I frequently have anonymous heads
3: The repo I'm pulling from has only one head
Expected behavior:
`hg pull --rebase` does a pull, and then does, effectively, `hg rebase -d tip`
Actual behavior:
It either says something like 'nothing to rebase', or mentions that I have
multiple heads and need to pick one (but I can't, because `hg pull --rebase`
does not accept a -d flag, or provide a way (afaik) to configure the default
destination.
Reproduction script and output from running that script on both 3.7.3 and
3.8-rc+9 is attached.
I don't know what is the best way to solve this. Needing to specify '-d tip'
would be annoying, but doable. Being able to configure a default destination
for `hg pull --rebase` would be nice. Having different behavior for default
destination selection for `hg pull --rebase` and `hg rebase`, such that it just
did the right thing (where "what it did before" was "the right thing" in my
case, but maybe not everyone's, so this might be difficult-to-impossible),
might be best?
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list