Re: [ANNOUNCE] TopGit v0.3

From: Petr Baudis <pasky@suse.cz>
Date: Sep 21, 2008, 14:24 UTC
Message-ID: <20080921142445.GJ10360@machine.or.cz>
In-Reply-To: <1221648520.30402.12.camel@heerbeest>

On Wed, Sep 17, 2008 at 12:48:40PM +0200, Jan Nieuwenhuizen wrote:

Show 13 quoted lines

> On vr, 2008-09-12 at 19:14 +0100, martin f krafft wrote:
> 
> > I've considered this question a lot before and could not come up
> > with anything; you cannot undo a merge.
> 
> Isn't that overly pessimistic?  Can't we have git create a merge
> commit that can be reverted with git revert?
> 
> For our ooo-build use case, I'm hoping to use [top]git as "a better 
> patch" and hope to have mostly orthogonal topic branches.  With patch,
> to "undo a merge" usually means patch -R and remove the patch from
> the dependency list.  I can hardly imagine something easily possible
> with patch is still impossible with git.

The problem is that you can undo the merge content, but not the history information. So this revert can e.g. propagate even into branches which still *should* depend on the other branch, you get into trouble when you want to make your branch depend on the other one anyway, etc.

				Petr "Pasky" Baudis