I am just starting from the bazaar, and I have found that the checkout function is most useful for the way I work - namely, I can c / o from the “master copy”, do some development, and then commit my changes to the new directory. He then updates the “master copy”.
But what if I work on (for example) two projects, changing different parts of the code? Say:
~/master - master copy
bzr co master ./gui
bzr co master ./engine
So, I am doing things related to gui in a directory. / gui and under the hood c. / engine. How should I make my changes? If I take gui first, then the engine, I think, will any conflicts be flagged in the engine?
Is there a way to combine gui and engine and then make only one commit for the main copy?
To make things a little more complicated, how about if I do this:
bzr branch gui ./mouse
Now I may have worked on the mouse, but also on the gi. If I want to combine the code with gui AND mouse and then commit the wizard, what is the best way to manage this? Or really, if I also:
bzr branch gui ./keyboard
If I changed the modified gui, keyboard and mouse, should I merge hierarchically - i.e. mouse + keyboard and then combine this with gui and then translate gui into master?
Hope this is clear what I'm trying to achieve! Thanks in advance for your time.