maas-devel team mailing list archive

[Jeroen Vermeulen <jeroen.vermeulen@xxxxxxxxxxxxx>]

On 04/07/2014 09:17 PM, Graham Binns wrote:

> If you need to do things the other way, bzr merge -c is your friend:
> 
>  my-trunk-branch$ bzr ci -m "Fix the doodad that's broken."
>  (Now at revno 1234)
>  my-trunk-branch$ cd ../my-1.5-branch
>  my-1.5-branch$ bzr merge -c1234 ../my-trunk-branch
> 
> That will pull in *only* the changes from the relevant revision.

Another way to do that is to specify a range of revisions:

    bzr merge -r1233..1234 ../my-trunk-branch

That merges only the _changes between_ revisions 1233 and 1234 in trunk.
 In other words, it merges just revision 1234.

You can also use that trick to revert a range of revisions, by
specifying it backwards:

    bzr merge -r1234..1233

This undoes revision 1234 by merging the changes from revision 1234 to
revision 1233.


Jeroen