From: Santi Béjar <sbejar@gmail.com>
Date: Tue, 12 Aug 2008 21:28:42 GMT
Subject: Re: TopGit: problem with patch series generation
Message-ID: <8aa486160808121428t259f5340x6d1a14cadedac30c@mail.gmail.com>
In-Reply-To: <20080812161854.GB30067@lapse.rw.madduck.net>

On Tue, Aug 12, 2008 at 18:18, martin f krafft <madduck@debian.org> wrote:
> Hi folks,
>
> I am playing around with TopGit and encountered a (conceptual)
> problem. I'd love to hear some input.
>
> I want to use TopGit for distro packaging. Any of my packages have
> one or more feature branches, some intended for upstream, some
> distro-specific. 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).
>

I don´t know if it fits topgit, but this is what Junio uses:

http://article.gmane.org/gmane.comp.version-control.git/24498

Basically he creates a new feature branch that is the merge of the
conflicting branches (it works for both semantically and explicit
conficts), and there he resolves the conficts. Then if one of the
branches are merged in master (in you case a patch is created) then
the other branch fast-forward to the merge.

HTH,

Santi