> the merging process, which took almost 2 years (until now)
Actually, not even one. And that only because I got *really* busy, and was
told that I should commit it finished rather than as a work-in-progress,
which meant that no one else was contributing to it.
> Nobody knows which is the real head branch, etc.
branch_2_1_fcs has always been the branch for developing the current code,
whereas MAIN (trunk/) was future code. We've already said that much of the
code change there would go away, except for the build environment, updates
to Avalon and Jason's work on IMAP. None of which we want to lose.
> There is nothing to lose, we don't use anything from the
> head anyway.
That is entirely wrong, as noted above. And part of the issue with the
merger is making sure I don't lose any of those important parts. Plus the
crazy schedule I've been keeping since last June.
Blame me if you want. Enough validity in that, I suppose. I recently
installed a VM on my laptop to carry around a JAMES build environment, so
that I can work when I catch time, and plan to start committing the merger
in parts, rather than as a whole, so that others can help out.
Will start tonight when I get back from a client's site. Now I have to go.
--- Noel
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
