[issue1415] rebase and named branches
Antoine Pitrou
mercurial-bugs at selenic.com
Thu Dec 4 06:13:54 CST 2008
New submission from Antoine Pitrou <pitrou at free.fr>:
I have just tried the new rebase extension in Mercurial 1.1 and I have problem
getting it to work in an useful way with named branches.
The typical workflow I have is that the public history of the project I work on
is in branch named e.g. "trunk", and when I want to do some work I create
another named branch locally e.g. "work". Until now I have used manual pulling
and merging when wanting to rebase the local branch with remote changes. It
works well but isn't very automatic (especially given that "hg fetch" is still
broken in the face of named branches).
I wanted to see if the new rebase extension would make this workflow simpler,
but there are two problems :
1) there's no way to ask it to rebase all the changesets from a named branch
(other than manually finding out the first changeset in the branch)
2) when it does the merge, it does it in the wrong named branch, i.e. when I try
to rebase a changeset from the "work" branch onto the tip (which is in the
"trunk" branch), the merge commit ends up in the "trunk" branch rather than in
the "work" branch. But the whole point of having named branches, in this
workflow, is that the "trunk" branch contains only the pristine remote history.
----------
messages: 8068
nosy: pitrou
priority: bug
status: unread
title: rebase and named branches
____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1415>
____________________________________________________
More information about the Mercurial-devel
mailing list