Bazaar

Diverged branch.. but really i don't want merge...

Asked by Sawyer

Environment:
- Featured branch: trunk is production line
- Branch (source trunk) is pre-production line
- Branch (source pre-production) is development line.

-Branch (source trunk) is for Feature1
-Branch (source trunk) is for Feature2

Feature1 develops, make commit's and finally push to branch development. No problem.
Feature 2 develops, make commit's and finally push to branch development. Problem... (bzr: ERROR: These branches have diverged. See "bzr help diverged-branches" for more information.)

I know that i should merge to feature 2 (last revision from development), but if i do this, code from Feature1 pass to Feature2 and I must avoid this situation, I need keep all features branch only with its own code. Because I need to move feature code to my 3 environment branchs (development, preproducction, production) in a isolated mode.

Any sugestion? or may be i shoud create the project with different structure?
My target is be able to move one feature branch to the 3 lines and one move not implies move another feature code.

Thank you !

Question information

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

I think what you want to be doing here is merging *from* the feature branches into the integrated branches, whether that is the development trunk, pre-production, or whatever. Don't merge the features into each other unless one feature depends on an existing but not-yet-integrated feature.

Revision history for this message
Sawyer (jcosano) said : 		#2

Ok, I see Bazaar is highly flexivity! I'm from clearcase world and in this environment there is only one road...

With this flexivity it's just as i need, the only problem will be merges... (i supose i will have a lot of manual merges if teams touch sames files, but this is unavoidable)...

thank you!

Revision history for this message
Sawyer (jcosano) said : 		#3

Thanks Martin Pool, that solved my question.