Re: CVS questions

[Spiro Trikaliotis]

Hello Segei,

* On Thu, Oct 30, 2008 at 03:36:48PM +0300 Sergei Organov wrote:
> "Bulgrien, Kevin" <address@hidden> writes:
 
> No, almost any recent tool handles branching and merging better than
> CVS. Even CVSNT and SVN are better,

Oh, SVN is better? Yes, obviously...

Did you ever check out only a subdirectory of a project? Then, on merge,
you must remember to give the complete path to that subdirectory in the
merge command (that is, for the URL, it does not suffice to give the
branch name; after the branch name, you also have to given the directory
you are in). If you fail to do so, your sandbox is completely broken. It
cannot be repaired, you have to check it out again and start over. I
really hope for you that you did not have any not yet committed changes
in the sandbox...

Thus, a line like

svn merge https://svnserver.some.where/project/tags/v1.2/some/sub/dir/ 
https://svnserver.some.where/project/tags/v1.2.1/some/sub/dir .

is so much more natural and cleaner than doing

cvs up -j v1_2 -j v_1_2_1

Of course, obviously, that's what I would call it, too.

Best regards,
   Spiro.

-- 
Spiro R. Trikaliotis                              http://opencbm.sf.net/
http://www.trikaliotis.net/                     http://www.viceteam.org/