[pooma-dev] Merging newfield_revision

[Mark Mitchell]

>
> It would probably be best to do this in the repository itself - i.e. to
> move the ,v files from the NewField directory to the Field directory.
> Otherwise we'll lose the CVS history.

Oh, how I'm bored of this argument... :-)  This comes up about every
3 weeks on some project or another.  What it really highlights is that
CVS is lame in this regard; you should not have to mess with the
repository and yet you should still get to keep your revision history.

Generally, I come down on the side of not moving the ,v files.  In the
presence of branches, you really don't have a choice: if we move the
,v files into the Field directory we will break the branch that
Jeffrey is making -- and any previous branches/tags that applied to
the old Field stuff.

-- 
Mark Mitchell                mark at codesourcery.com
CodeSourcery, LLC            http://www.codesourcery.com