← Back to team overview

maria-developers team mailing list archive

Re: request for advice on managing a mysql patch in bzr


On Fri, Feb 26, 2010 at 6:36 AM, Sergei Golubchik <serg@xxxxxxxxxxxx> wrote:
> When done, you'll still have your patches on top of the tree, and you
> can trivially extract them (e.g. with bzr log -p) and publish them.
> If you merge instead of rebasing, you'll have old patches in the tree
> and merge changes spread over many merge changesets.

There apparently isn't a trivial tool to import commits between two
branches. Doing something like this does way more than apply the diff
for that one change and copy the commit mesage.
    bzr merge -c revno:2 /s/bzr/fb/5.1

Mark Callaghan