25 Jun
2013
25 Jun
'13
5:48 p.m.
2013/6/25 Christoffer Holmstedt <christoffer.holmstedt@...400...>:
- If I develop a new feature in a separate branch is the following workflow
a correct way to get it into trunk?
cd trunk bzr pull (get the most reason trunk first) bzr merge ../myproject bzr commit -m "Added myproject" bzr push
Yes, this is the way I work.
Only one remark: if you used "bzr checkout" rather than "bzr branch" to obtain the trunk checkout, you commit directly to the remote repository - you can omit "bzr push" and use "bzr up" / "bzr update" to update the checkout.
The only thing that's disallowed is pushing your branch as the new trunk, because this would interfere with revision numbering.
Regards, Krzysztof