On Thu, Jul 12, 2012 at 8:50 PM, Alexandre Rostovtsev <tetrom...@gentoo.org> wrote: > Shouldn't CVS have prevented my changes to profile.mask from being > overwritten by the next committer?
Maybe Tony mismerged your changes into his? On Thu, Jul 12, 2012 at 9:04 PM, Fabian Groffen <grob...@gentoo.org> wrote: > On 12-07-2012 14:50:18 -0400, Alexandre Rostovtsev wrote: >> Shouldn't CVS have prevented my changes to profile.mask from being >> overwritten by the next committer? > > How could CVS have done that (or git, hg, whatever VCS)? In general, the VCS would not let you commit/push conflicting changes. For CVS, I think you cannot commit unless your local copy is up to date, so you'd have to update before committing, at which point CVS would launch a merge tool or put merge markers in the file. Right? Dirkjan
