Hierarchical history with solo project
[I'm a newbie] I am using bzr for a solo project. I have a MAIN branch and a DEV branch. I made lots of small commits on DEV to complete a feature: [4,5,6]. I call "bzr merge" but it says "Nothing to do" because MAIN hasn't changed. I call "bzr push" to move my changes into MAIN. According to the log, bzr appends the revision numbers onto MAIN so it's sequential: [1,2,3,4,5,6]. I would really like to keep the small commits separate so the log for MAIN is concise. I would prefer the log look like [1,2,3,4 merge]. And the small commits should use dotted notation: [1,2,3,4 merge, 1.1.1, 1.1.2, 1.1.3].
In short, I want hierarchical history as described here (http://
 I think I want the behavior of "git merge --no-ff branch" as described in git-flow: (http://
Can you help with this problem?
Provide an answer of your own, or ask Pinku Surana for more information if necessary.