On 24 April 2012 14:09, PJ Weisberg <pj@xxxxxxxxxxxxxxxxxxxxxxxx> wrote: > On Tue, Apr 24, 2012 at 11:54 AM, Hilco Wijbenga > <hilco.wijbenga@xxxxxxxxx> wrote: >> On 24 April 2012 10:17, <dag@xxxxxxxx> wrote: >>> Hilco Wijbenga <hilco.wijbenga@xxxxxxxxx> writes: >>> >>>> I'm assuming that if you have subproject S in umbrella project U and a >>>> branch "topic" in U then that same branch should exist in S. >>> >>> No, I think that is actually very rare. If topic branches really should >>> be mirrored then U and S should be one repository. They are too closely >>> coupled to be separated. But see the but about git-subtree and topic >>> branches below. >> >> Too closely coupled? I do not think breaking up a project into a set >> of libraries makes everything tightly coupled. I would argue the >> opposite. :-) Anyway, you answer my concern below. > > Indeed. But when you make a branch in your main project, wouldn't you > usually still want to use the master branch of the libraries? For those that haven't changed? Sure. I just (incorrectly) assumed that if I had a topic branch in the umbrella project I would need topic branches in all repos as well, otherwise I would end up with changes in both various masters and my topic branch. Too much exposure to submodules, I suppose. :-) But subtree works around that quite nicely so it really doesn't matter. I simply made one too many assumptions. :-) Similar answers to everything below. > Or if > there's an experimental branch in a library and you want to use that > branched version, wouldn't you still use the master version of all the > other libraries? What if you have two projects that both use a > library, but are otherwise unrelated? If you create a branch called > 'hotfix' in one project, do you automatically find your library > version switching to an unrelated 'hotfix' from another project? -- 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