Fixing rebase rather than avoiding it

[Russel Winder]

On Thu, 2010-03-04 at 20:37 +0100, Óscar Fuentes wrote:
> Stefan Monnier <monnier at iro.umontreal.ca> writes:
> 
> >> From the Emacs devs perspective, the problem with rebase is that it is
> >> yet another new concept and some people had enough of those.
> >
> > [ I'm not speaking as an Emacs dev in this thread. ]
> >
> > The problem with rebase, AFAIK (the problem that my suggestion aims to
> > solve) is that you can't "track" a branch that gets rebased.
> > I.e. rebasing cannot be used on branches that are published.
> 
> Of course. Nobody suggested rebasing public branches. This is about
> local history.

I think this thread (and all the various sub-threads :-) have come full
circle.  The thread started because of the issue that the public Bazaar
branch of Dulwich is being rebased on a regular basis.

So in the end I think we are all agreeing:  for those that want to use
it with their private branches, rebase is a nice tool.  Those who don't
like it, don't use it.  Rebasing of public branches is sufficiently
problematic to be a bad idea.

-- 
Russel.
=============================================================================
Dr Russel Winder      Partner
                                            xmpp: russel at russel.org.uk
Concertant LLP        t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,   f: +44 8700 516 084   voip: sip:russel.winder at ekiga.net
London SW11 1EN, UK   m: +44 7770 465 077   skype: russel_winder
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100305/e7c008b5/attachment.pgp