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

Re: Merges without bases

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Aug 26, 2005, 09:17 UTC
Message-ID
<46a038f905082602176f9eef5d@mail.gmail.com>
In-Reply-To
<7vvf1tps9v.fsf@assigned-by-dhcp.cox.net>
On 8/26/05, Junio C Hamano <junkio@cox.net> wrote:
> their core GIT tools come from.  But how would _I_ pull from
> that "My Project", if I did not want to pull unrelated stuff in?
and then... 
> What I think _might_ deserve a bit more support would be a merge
> of a foreign project as a subdirectory of a project.  Linus

tla has an interesting implementation (and horrible name) for something like this. In Arch-speak, they are called 'configurations', a versioned control file that describes that in subdirectory foo we import from this other repo#branch.

In cvs, you just do nested checkouts, and trust a `cvs update` done at the top will do the right thing; and in fact recent cvs versions do.

After using cvs and arch for a while, my opinion is that all this stuff is _bad_, and you want a makefile that pulls the projects together when you build them. Different projects are going to use different SCMs anyway, and you'll have to live with how to tag a release across repositories/scms, and I haven't seen any answer I like.

cheers,
martin
Previous: Eric W. BiedermanNext: Daniel Barkalow
Message 9 of 12 in “Merges without bases”
  1. Darrin ThompsonAug 25, 2005
  2. Darrin ThompsonAug 25, 2005
  3. Junio C HamanoAug 25, 2005
  4. Darrin ThompsonAug 25, 2005
  5. Tim OttingerSep 8, 2005
  6. Daniel BarkalowAug 26, 2005
  7. Junio C HamanoAug 26, 2005
  8. Eric W. BiedermanSep 9, 2005
  9. Martin LanghoffAug 26, 2005
  10. Daniel BarkalowAug 26, 2005
  11. Martin LanghoffAug 27, 2005
  12. Daniel BarkalowAug 27, 2005

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.