On Thu, Mar 17, 2011 at 11:40:06AM +0100, Michael Hanselmann wrote: > 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.
Yeah, that's true. My comment about completion is that I've seen whenever you have tags and/or branches named as files/directories in the tree, things get confusing, so I was hoping to avoid this. Hmm: instead of vABC, hABC? That would mean we'd have these tags: h0.0.3 h0.0.4 h0.0.5 … h0.2.8 h0.3.0 h0.3.1 Still keeps separate namespace :) iustin