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

Re: linearising TopGit forests into patch series (was: [ANNOUNCE] TopGit - A different patch queue manager)

From
Petr Baudis <pasky@suse.cz>
Date
Aug 9, 2008, 01:08 UTC
Message-ID
<20080809010821.GT10151@machine.or.cz>
In-Reply-To
<20080808170658.GA16055@lapse.rw.madduck.net>
Hi!
On Thu, Aug 07, 2008 at 02:56:24PM -0300, martin f krafft wrote:
Show 5 quoted lines
> Assuming a number of interdependent topic branches, does TopGit
> provide a way for me to linearise/flatten/serialise these branches
> in a one-patch-per-branch fashion, so that I could turn any TopGit
> repository into a quilt series? I am only interested in a one-way
> conversion from TopGit to quilt for now.
Not _yet_. But it very well could, and it should be really simple.
There are two parts:

(i) First, getting a "tidied up" commit structure from TopGit, having one commit per patch (branch). This is something covered currently in the README by:

	TODO: tg collapse for creating a one-commit-per-patch tidied up
		history (for pulling by upstream)
So it's not implemented yet, but it should be *very* easy to do.

(ii) Second, linearizing this commit structures to a series. This should be as simple as running

	git log --pretty=email -p --topo-order
on the collapsed history.
Show 7 quoted lines
> The reason for this is quite simply that while it's fabulous to use
> e.g. Git for managing the source repository from which to build
> distro packages, the resulting packages will have all
> distro-specific changes applied or collated into a single diff. This
> makes it hard for other distributions to grab patches, for upstream
> to keep on top of what is being distributed, and for bug fixers to
> separate patches and test only specific ones.
This is exactly what TopGit seeks to alleviate.
On Fri, Aug 08, 2008 at 02:06:58PM -0300, martin f krafft wrote:
> Also, what happens if branches cross-merge?

This would mean there is circular dependence between the branches, which is invalid setup for TopGit - you could not get a linear ordering out of the branches anyway; in result, each branch has to turn out to a single final Git commit - with circular dependencies, you cannot do that.

-- 
				Petr "Pasky" Baudis
The next generation of interesting software will be done
on the Macintosh, not the IBM PC.  -- Bill Gates
Previous: Bert WesargNext: Petr Baudis
Message 12 of 14 in “[ANNOUNCE] TopGit - A different patch queue manager”
  1. Petr BaudisAug 3, 2008
  2. Miklos VajnaAug 3, 2008
  3. Petr BaudisAug 3, 2008
  4. [TopGit] Check for pre-commit hook existence.Russell Steicke, Aug 3, 2008
  5. Petr BaudisAug 3, 2008
  6. Jon SmirlAug 3, 2008
  7. Karl HasselströmAug 4, 2008
  8. linearising TopGit forests into patch series (was: [ANNOUNCE] TopGit - A different patch queue manager)martin f krafft, Aug 7, 2008
  9. Bert WesargAug 7, 2008
  10. martin f krafftAug 8, 2008
  11. Bert WesargAug 8, 2008
  12. Petr BaudisAug 9, 2008
  13. Petr BaudisAug 10, 2008
  14. Sam VilainAug 9, 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.