4 ms·

I'm sure they did. But wasn't it painful before git/mercurial? That's what I heard from people who used CVS in the past.

• vidarh 12y ago
  It is/was painful if you try to merge multiple diverging branches. The CVS solution to that is generally "don't do that", or for everyone on long lasting branches to rebase as frequently as possible. But this is not all that much of a problem in small cohesive teams where everyone with commit rights knows what the others are likely to be working on.
• kasey_junk 12y ago
  CVS was difficult but there were non distributed vcs that had easy branching.
  • tptacek 12y ago
    In practice, a lot of the stuff that was difficult about branching and merging was just handled outside the VCS, and projects had rules about what you'd do inside the VCS. It worked, and still does for OpenBSD. At Arbor, the last CVS job I worked (back in ~2003), we did release and dev branches no problem. I don't remember fretting about it much. The big issue I remember is, it was a much bigger deal not to break the build.
• deleted 12y ago
  [deleted]