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

Re: simple cvs-like git wrapper

From
EPEd S. Peschko <esp5@pge.com>
Date
Jan 31, 2008, 05:41 UTC
Message-ID
<20080131054124.GG9612@venus>
In-Reply-To
<20080131040839.GW24004@spearce.org>
Show 6 quoted lines
> Merging all branches on the remote named "origin" is simply not an
> intelligent thing to do.  Nobody blindly merges everything available
> from a remote, and nobody has ever asked for such a function before
> in Git.  I still think its nuts, but I don't know all details of
> your situation so I'll just shut up now and hope you know what you
> are really asking for.

Ok, I'm not going to belabor the point, but for the most part, the requests in our particular domain are separate. A developer for the most part works only on files that other developers are not working on.

There are exceptions to this, but for the most part this is true.. Hence, most of the time there will be no conflicts.

Anyways, I'll try to improve on your script, but it looks like what I want to do.

Show 7 quoted lines
> This is going to be slow as you are running git-merge for each
> and every branch available to you.  You can do a lot better by
> loading the branch DAG into memory in Perl/C/Python and doing a
> graph coloring algorithm to see if a merge is necessary or not,
> as if you are merging everything all of the time almost everything
> is going to be always merged to everything else.  Which as I said
> earlier is nuts.

hmm. Is there a simple method to get this graph? I'm assuming that you would have to get all the local commits and compare them to the remote commits, and only merge the branches that have commits not yet merged..

Ed
Show 6 quoted lines
> -- 
> Shawn.
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous: Shawn O. PearceNext: Shawn O. Pearce
Message 7 of 15 in “simple cvs-like git wrapper”
  1. Ed S. PeschkoJan 29, 2008
  2. Jakub NarebskiJan 29, 2008
  3. Ed S. PeschkoJan 30, 2008
  4. Shawn O. PearceJan 30, 2008
  5. Ed S. PeschkoJan 30, 2008
  6. Shawn O. PearceJan 31, 2008
  7. Ed S. PeschkoJan 31, 2008
  8. Shawn O. PearceJan 31, 2008
  9. Junio C HamanoJan 31, 2008
  10. Daniel BarkalowJan 30, 2008
  11. Kate RhodesFeb 1, 2008
  12. Johannes SchindelinFeb 1, 2008
  13. Jakub NarebskiFeb 1, 2008
  14. Uwe Kleine-KönigFeb 1, 2008
  15. Jakub NarebskiFeb 1, 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.