Mercurial：如何在不丢失历史记录的情况下将单个分支拆分为两个？

Question

I have a mercurial repository with a default branch containing two directories at the top level: "demo/" and "product/". I want to do the following, retaining change history if possible:

1) Put everything in "demo/" into a new demo branch. All the files under demo/ would be moved one level down in this new branch, and no demo/ folder would exist in either the default or demo branch.

2) Move everything in "product/" one level down in the default branch, and remove the product/ directory.

The second part seems simple enough and can be done with simply "hg mv" on all files and folders stored in product/ to one level below. So I think that will work as long as hg mv handles the fact that the path for all files in the product/ directory tree change.

The first issue is what I'm having trouble with. Specifically, how to do without losing all the history of files contained in demo/. After some reading, hg rebase doesn't seem like a solution. There's a ton of history here (this repository was originally CVS, then migrated to SVN, now is in Mercurial). I searched for solutions to this issue and all of them focused on moving entire changesets to a different branch, which is not what I desire. What would be the best approach for me to take here?

Answer 1

If I understand right, this would take 3 steps.

Step 1

• in the default branch
• move "product/"
• commit ( commit A )

Step 2

• still in the default branch
• move "demo/"
• merge or create demo branch (commit B )

Step 3

• update to commit A (should be back in the default branch)
• remove "demo/"
• commit ( commit C )