[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Conflict marker detection debate
From: |
Greg A. Woods |
Subject: |
Re: Conflict marker detection debate |
Date: |
Mon, 16 Jul 2001 17:53:23 -0400 (EDT) |
[ On Monday, July 16, 2001 at 16:53:41 (-0400), Noel L Yap wrote: ]
> Subject: Re: Conflict marker detection debate (Was: How well does CVS
> handle other types of data?)
>
> It's up to the user and processes to make such verifications.
No, it's not. CVS must assure that conflicts it introduces during a
merge have been resolved. It can easily do so. The user's
responsibility is only to do the conflict resolution.
(The user must always verify the correctness of any merge -- but the
requirement to do so is outside the domain of CVS' implementation.)
> So now you want to change the build system as well?
Huh? No! CVS is not a build system. I'm talking about
> What about those not on this list?
What are you talking about? What's "not on this list"?
--
Greg A. Woods
+1 416 218-0098 VE3TCP <address@hidden> <address@hidden>
Planix, Inc. <address@hidden>; Secrets of the Weird <address@hidden>