← Back to team overview

maria-developers team mailing list archive

Re: Bzr merge order

 

Hi!

Kristian Nielsen пишет:
[skip]
> Just wanted to hear if there are any other opinions on this?


Since we switched to bazaar I do it in such way (to reduce merge commit
size):

1) bzr branch <current-main-tree>  <merge-tree>
2) cd <merge-tree>
3) bzr meerge ../<tree-with-patch>
4) build/test
5) bzr gcommit
6) bzr push (or merge) to (or with) <current-main-tree> and so on



Follow ups

References