Is rebase a (or the) way to do this?
Doug Lee
dgl at dlee.org
Tue Feb 10 13:27:57 GMT 2009
Scenario: Multiple developers using either lightweight checkouts or
bound branches, all sharing a central repository. I am one:
... work work work ...
bzr commit -m "Today I brew, tomorrow I bake..."
*** discover the central server is down or I don't have Internet
!! --local (repeat last commit locally)
... more work, more commits ...
*** Server/Internet comes back
Now... I have this stack of commits, which I'd like logged in `bzr
log' history centrally. `bzr push' will do it, but only if nobody
else committed in my absence. If they did, I can do `bzr update' then
`bzr commit', but my history seems to be skipped in the central
branch.
Is this where I use `bzr rebase <central_branch>' and then `bzr push'
to do what I want, or am I missing something, like a better way? (I
think the new -n option for `bzr log' may help, but I haven't tried
that yet.)
Thanks much.
--
Doug Lee dgl at dlee.org http://www.dlee.org
SSB BART Group doug.lee at ssbbartgroup.com http://www.ssbbartgroup.com
"I forgot, because I wanted to forget, except I don't remember
forgetting." --Sarah Alawami
More information about the bazaar
mailing list