Bazaar

Can't remerge feature branch after reverse cherrypicking

Asked by Brian Butz

Using bzr version 2.1.2.

A feature branch was accidentally merged into our trunk branch and went unnoticed for a while. I reverse cherry picked it out doing:

bzr merge -r 1000..999

A few changes have been made in that feature branch, and it is now ready for merging into trunk. When I try and merge it back into trunk, it only merges in the changes that have been made on that feature branch since after it was first merged, while I'm expecting the entire feature branch to merge in.

Was wondering if anyone knew what the solution was to get it to merge back, and if this is even the right workflow for taking something out of a branch.

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

Do a merge of the range of things you want to bring back in, going
back to before the original incorrect merge. For instance if you
originally merged 800..900 of that branch, do a new merge -r 800..

Or, if it's easier, just undo your reversion, with eg 'bzr merge -r 999..1000 .'

Can you help with this problem?

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

To post a message you must log in.