Bazaar

When joining trees, history is lost

Asked by Jurgen Defurne

https://answers.launchpad.net/bzr/+question/71563

I tried the above solution and, while the joining works, unfortunately all history of the joined tree is lost, and the operation is flagged as addition of new files. I did upgrade both repositories to 2a format and branched from them.

This statement on the join command :

This is marked as a merge of the subtree into the containing tree, and all history is preserved.

does not seem to work in the case of upgraded (as opposed to initial created) repositories, with changing the tree root by means of the above procedure.

I use bzr 2.1.0, repositories where upgraded from format 6 to 7.

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Solved by:
Marius Kruger
Solved:
Last query:
Last reply:
Revision history for this message
Best Marius Kruger (amanica) said : 		#1

Merged revisions are not shown by the normal log command. The following would show them:
bzr log --include-merges
bzr log -n0

Revision history for this message
Jurgen Defurne (jurgen-defurne) said : 		#2

By accident I found this out on a merged branch. I haven't had time to test it with a joined tree yet due to lack of time. Anyway, thanks for confirming my suspicion.

Regards,