<html>
<head>
<style><!--
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
font-size: 10pt;
font-family:Verdana
}
--></style>
</head>
<body class='hmmessage'>
> I posted a description on cvs merges some days ago, or didn't it show<BR> > up on the list?<BR><BR>
It seems to require me to know every change in the system and what<BR>
branch it is in. I do that to some extent, and when I can't, I diff my two trees.<BR>
<BR>
With perforce you just tell it the two branches and it knows which changes<BR>
are in which branch, basically. At least it seems to keep a high water mark.<BR>
<BR>> > In this case I just copied the entire file. I wonder if we should <BR>> > apply for a Perforce<BR>> > open source license. It does branching very well, knowing what <BR>> > changes are where.<BR>> <BR>> Not now. If everybody agrees (which I don't think, as others will<BR>> prefer subversion or git or mercurial or ...) _and_ we do much branching,<BR>
<BR>
I've done some research here sort of, at least read stuff, guaged<BR>
popular opinion.<BR>
I have a lot of experience with Perforce and highly recommend it.<BR>
But it isn't free beer for any project and source isn't available. <BR>
It isn't just merging/branching that it does well. It does basically <BR>
everything well, except it isn't distributed. It has a good command line<BR>
interface, a good gui, pretty good platform support. <BR>
I'm not sure of its perf over slow network. <BR>
<BR>
Otherwise git and mercurial seem to the most popular, but git is<BR>
seen as perhaps too hard to use. I might shortly have to use/learn mercurial<BR>
for a small project (said project considered git as well, but chose mercurial).<BR>
<BR>
Subversion is better than CVS and has atomic multi-file changesets.<BR>
Historically its branching support is terrible, again you have to know<BR>
which changes are in which branch. They might have fixed that by now.<BR>
<BR>
Monotone sounds good, but git and mercurial seem more popular.<BR>
<BR>
Conversion from cvs seems supported well enough.<BR>Some of the systems support on-going bidirectional conversion,<BR>
including accepting CVS commits. Some support read only CVS mirrors.<BR>
<BR>
> So p007 should now terminate on any platform with Tony's fixes?<BR><BR>
That is my hope/expectation.<BR>
I haven't tested it.<BR>
<BR>
- Jay<BR> </body>
</html>