From: Avery Pennarun <apenwarr@gmail.com>
Date: Tue, 12 Aug 2008 16:25:36 GMT
Subject: Re: TopGit: problem with patch series generation
Message-ID: <32541b130808120925y663967ebm38eced6df77ffe4@mail.gmail.com>
In-Reply-To: <20080812161854.GB30067@lapse.rw.madduck.net>

On Tue, Aug 12, 2008 at 12:18 PM, martin f krafft <madduck@debian.org> wrote:
> As I am packaging TopGit for Debian, I encountered
> the situation that two branches conflict with each other (they
> change the same line), but there is no dependency between the
> branches. Thus, when I squash the branches into a series, the
> resulting patches will not apply (they both change the same original
> line to something else).

Isn't this what git-rerere is for?  If TopGit doesn't use rerere,
maybe it would be easy to add...

Have fun,

Avery