Am 17. März 2011 11:32 schrieb Iustin Pop <ius...@google.com>: > - add temp file htools/.temp (patch sent) > - git remote add htools git://git.ganeti.org/htools.git > - git merge -s recursive -X subtree=htools remotes/htools/master > - rm htools/.temp (actually revert the first patch) > - do *not* push the htools tags as is, because they match the ganeti > tags format (there are no conflicts as htools highest version is 0.3.1) > - instead, add for each htools original vx.y.z tag, a 'htools-vx.y.z' > tag; is this naming fine? it will ruin completion, so maybe > vx.y.z-htools? (i think i like this better)
I'd prefer “htools-v…” as it gives a clear namespace. > At this point, the sources are mixed, but there are no other changes. So > next steps will be: > > - move the man pages out of htools/man to man/ > - move the single design to do docs/ > - add ./configure support for detecting ghc/enabling htools (./configure > --enable-htools [default=auto]) and needed Haskell modules > - integrate htools/Makefile into Makefile (rather than call it > recursively) > - so that the default install targets can install the programs if > enabled > > At this point, the basic integration is done. The htools master branch > will get an update on its README about the integration and the > deprecation of the repository. > > If we need to make another htools release before 2.5 is out and has > htools too, then we would re-merge, as only the haskell source code will > have been modified. > > Further work will be: > > - integrate unittests (make check should do everything) > - make coverage reports integrate sanely > - make QA use the built hail iallocator > - integrate the live-test.sh from htools into the QA suite > - have fun! > > How does this sound? LGTM (the end is near) Michael
