Code review comment for lp:~annegentle/nova/docs

Ah, I see.

OK, do this then on your laptop:

# I assume below your local branch of trunk is called "trunk"...
bzr branch trunk new-docs
cd new-docs
bzr merge -r revno:593:../docs

That should do the trick I think :)

bzr diff | less

and check the diff only include the doc fixes, then if it all looks good:

bzr commit -m "Merge doc changes for db sync"
bzr push --overwrite lp:~annegentle/nova/docs

-jay