git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: TopGit: problem with patch series generation

From
SBSanti Béjar <sbejar@gmail.com>
Date
Aug 12, 2008, 21:28 UTC
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:
Show 14 quoted lines
> 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
Previous: martin f krafftNext: martin f krafft
Message 6 of 11 in “TopGit: problem with patch series generation”
  1. martin f krafftAug 12, 2008
  2. Avery PennarunAug 12, 2008
  3. Bert WesargAug 12, 2008
  4. Petr BaudisAug 12, 2008
  5. martin f krafftAug 12, 2008
  6. Santi BéjarAug 12, 2008
  7. martin f krafftAug 12, 2008
  8. Petr BaudisAug 12, 2008
  9. martin f krafftAug 12, 2008
  10. martin f krafftAug 12, 2008
  11. Petr BaudisAug 13, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.