Marc Branchaud venit, vidit, dixit 17.10.2008 16:44: > Thanks for joining the thread, Michael! Sure, there's no need to mention it. Well, maybe there is, given the recent discussion: Everyone can contribute (with or without C/perl/whatever fu) and thus "pay back" for free software, even by "only" trying to answer questions. But it requires participation, combining efforts, rather than splitting off and not returning... Uh, sorry, your question: > Michael J Gruber wrote: >> Would it be sufficient for you if a clone could trigger the main repo to >> update its remotes (i.e. git remote update)? > > Hmmm, I'm not sure... How would the overall > merge-in-changes-from-upstream process work in that case? I thought your problem was "transporting" the remote branches from main (which tracks external) to clone, without having the remote config for external on the clones. In that case being able to trigger "remote update" on main from the clones would help. > Say the main repo has the code for "ThingOne" merged under a top-level > thing-one/ directory: > > main/$ git remote add -f ThingOne git://thing/ThingOne.git > main/$ git merge -s ours --no-commit ThingOne/master > main/$ git read-tree --prefix=thing-one/ -i ThingOne/master > main/$ git commit -m "Merged ThingOne into /thing-one/" > > Then the ThingOne folks update their code, so we want to incorporate > their changes into our version of their code. I think you're suggesting > that we might make a clone of the main repo then trigger a "git remote > update" in the clone's origin: > > clone/$ make-origin-do-git-remote-update > > What's not clear to me is how to proceed from here. At this point I'm > hoping there's some way I could do some work in the clone to merge the > changes the ThingOne folks did into our code. I'm too new to git to > know if there is a way forward -- is there? > > (With the subtree merge pattern I'd run "git pull -s subtree ThingOne > master" in the main repo -- is there an equivalent achievable in the > clone if the main has done a "git remote update"?) "pull -s strategy repo master" does a fetch followed by "merge -s strategy repomaster", where repomaster is the ref for master on repo. So, if you got that branch (repomaster=ThingOne/master) by cloning from main you can do the merge (subtree or other) on your clone, even without the remote repo config for ThingOne on clone. I guess you want to do those merges on several clones, and main, and push everything back to main. I don't know how well that mixes, but I don't expect problems, only unexpected ones ;) Cheers, Michael -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
