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

Re: TopGit: problem with patch series generation

From
Avery Pennarun <apenwarr@gmail.com>
Date
Aug 12, 2008, 16:25 UTC
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:
Show 6 quoted lines
> 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
Previous: martin f krafftNext: Bert Wesarg
Message 2 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.