Rebasing published branch

[Harvey Chapman]

> On Feb 10, 2015, at 8:36 AM, Harry . <voldermort at hotmail.com> wrote:
> 
> My repository consists of 2 branches, a and b (actually bookmarks). 
> Development mostly takes place on a, while b contains small changes to 
> several files needed to produce a different type of build. I regularly 
> rebase b onto a.
> 
> 
> This is all fine and dandy, except that I have to force b to a 
> lower phase before rebasing, then strip the old branch from the remote 
> repository after pushing.
> 
> 
> Is there a better workflow?

Is there anything wrong with merging?

... some changes on ‘a’
hg up b
hg merge a
hg commit -m “merged changes from a into b”
hg up a
... continue working on ‘a’

@    changeset:   7:5af2cf138f7b   b
|\                merged changes from a into b
| o  changeset:   6:1ec72275a383   a
| |               E
| o  changeset:   5:436e8c202749
| |               D
o |  changeset:   4:75fa541adfa2
|\|               merged changes from a into b
| o  changeset:   3:f7185bd3847f
| |               C
| o  changeset:   2:7bbfeb3ecb42
| |               B
o |  changeset:   1:6709b5c785f0
|/                different type of build
o  changeset:   0:e23856969bb4
                initial work on a