Bazaar

bzr-svn: Merging branch to trunk

Asked by peter07

Hi, I'm new bzr user and I have problem with bzr-svn. Bazaar documentation in section "Merging trunk to your feature branch" best matches my problem. I have feature branch, trunk in svn, and error after push:

bzr: ERROR: Operation denied because it would change the mainline history. Set the append_revisions_only setting to False on branch ...

There is hint in documentation: "...Instead, use merge to reintegrate your changes back to the mainline. Using merge, won’t alter the order of the commits on trunk. It will simply introduce a new commit, just like merging in Subversion..."

My question is how can I execute this second merge, that will reintegrate my changes to trunk? First "bzr merge" puts changes from svn trunk to ma branch, second execution of "bzr merge" ends with "No revisions to merge"?

Thanks for help

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Martin Pool (mbp) said : 		#1

What I think you should do here is to have your own bzr-checkout of the svn trunk. Make your changes on a separate bzr branch. When you're done, first update your svn checkout. Then merge from the bzr branch into your checkout of trunk. Then commit there.

Can you help with this problem?

Provide an answer of your own, or ask peter07 for more information if necessary.

To post a message you must log in.