emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: base


From: Leo
Subject: Re: base
Date: Tue, 24 Aug 2010 08:22:56 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (Mac OS X 10.6.4)

On 2010-08-24 07:01 +0100, Stephen J. Turnbull wrote:
> True as you mean it. However, it is technically possible (especially
> in git) to change *pointers* to shared history in a way that can
> really confuse the tool. And in Bazaar and Mercurial it's even worse;
> they don't provide reflogs or rerere, so you can really wedge things
> if the rebase involves conflicts and the original branches have been
> deleted.

But the minute you publish your screwed-up history to the shared repo,
you can not escape being caught (in git it will happen as soon as
someone does a fetch) and as a result you lose the trust of your peer
developers. The history will then be reset to the correct one (push -f)
and possibly also an apology for the screwup.

Leo




reply via email to

[Prev in Thread] Current Thread [Next in Thread]