Here are the precise commands I used, in case that is helpful:
bzr branch lp:~loco-directory-dev/loco-directory/0.2 bzr branch lp:~ronnie.vd.c/loco-directory/570613 cd 570613 bzr merge -r revid:<email address hidden> ../0.2/ bzr ci -m "Merge 611304 branch." bzr merge -r revid:<email address hidden> ../0.2/ bzr revert . bzr ci -m "Merge unintentional revert, reverting it." cd ../0.2 bzr merge ../570613/ bzr ci -m "Merge 570613 to trunk." bzr push lp:~maxb/loco-directory/710969-example
Here are the precise commands I used, in case that is helpful:
bzr branch lp:~loco-directory-dev/loco-directory/0.2
bzr branch lp:~ronnie.vd.c/loco-directory/570613
cd 570613
bzr merge -r revid:<email address hidden> ../0.2/
bzr ci -m "Merge 611304 branch."
bzr merge -r revid:<email address hidden> ../0.2/
bzr revert .
bzr ci -m "Merge unintentional revert, reverting it."
cd ../0.2
bzr merge ../570613/
bzr ci -m "Merge 570613 to trunk."
bzr push lp:~maxb/loco-directory/710969-example