Is rebase a (or the) way to do this?

[Doug Lee]

On Tue, Feb 10, 2009 at 08:10:55AM -0600, John Arbash Meinel wrote:
> Doug Lee wrote:
> > 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.
> 
> If you do "bzr up && bzr commit" at this point, you will have the
> commits, but they will be shown indented. At least if you do "bzr log
> - --long" (the default). "bzr log --short" will only show a [merge]
> mention for the commit.

Ah... I have a "log = log --short" alias in bazaar.conf; explains why
I never saw indented commit logs.  I'll like being able to see those
with --short.  That should be good enough.  A "-n0" will probably get
added to my alias.

-- 
Doug Lee                 dgl at dlee.org                http://www.dlee.org
SSB BART Group           doug.lee at ssbbartgroup.com   http://www.ssbbartgroup.com
"All these years, the people said, 'He's acting like a kid.'
He did not know he could not fly, so he did."
--Guy Clark, "The Cape" (Dublin Blues)