Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  • Put subsubpackages in their own repositories in Git; use some existing tool, like subtrees or subrepos, to keep track of the "real" structure
  • Put subsubpackages in their own repositories in Git; use homegrown scripting to bridge the gap between git structure and CVS structure
  • Eliminate subsubpackages by changing organization in CVS and updating references as needed

Git or third-party "Sub" tools

 From the documentation for subtree and subrepo it seems likely that git submodule, the original and fully-integrated-into-git attempt to solve this kind of problem, is not suitable for our case (three levels of repositories, none of them external and all potentially undergoing active development). The other two, at least, deserve a closer look, but the discussions in the documentation cited above are sobering.  Before trying to decide if any of these are suitable for us we should think hard about how we plan to do development.  Using clones?  Branches?  Or just commit to master, identifying known good commits with tags and avoiding conflicts among developers with informal communication? 

Scripting bridge

Each subpackage or subsubpackage (that is, anything with an SConscript in its top directory) goes in a separate repository, as with previous strategy. 

Flatten hierarchy