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. >>> Of course, this is entirely driven by git-subtree's model of actually >>> incorporating subproject history into one big umbrella repository. >>> There is no separation between the subprojects and umbrella projects. >>> It's one giant history. Therefore, push/pull to/from subprojects are >>> explicit operations. That's probably not the best model for every >>> situation but I find it very nice. >> >> I do not have enough (okay, any) experience with subtree to comment on >> that. The first part seems just what I want. I'm not sure about the >> explicit pushing/pulling part. That sounds too much like asking for >> the sort of problems that scared us away from submodules. Hopefully, >> I'm dead wrong. :-) > > With subtrees, a topic branch in the umbrella project WILL be reflected > in the subproject because it is really one big repository. It's a > little inconvenient to subtree push a new tag at the moment. You have > to do a subtree split to a new branch and then push the branch to the > original component repository. That's one thing I want to improve in > the short term. I have found a need for then when creating release > tags. Okay, that would work fine. I have no problem with a bit of extra work here. (In fact, this is probably where I would *want* a bit of extra control.) What would happen if you had a bunch of commits in the umbrella project and then did a push? Would that error out? Are there protections in place to prevent developers from making silly mistakes like that? > But still, it seems odd to me that you'd create a topic branch in U and > then want to push it to a separate S repository. Topic branches are by > nature ephemeral and I have never had a need to do something like that. > It just seems to go against the grain of what a topic branch is. As I > said above, release tags and such are in a different category and that > is the main target of the subtree push enhancements I want to make. I had not realized all changes would simply be part of the umbrella project. Given that, a topic branch in each subproject's repo is unnecessary. Cheers, Hilco -- 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