[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: How well does CVS handle other types of data?
From: |
Jimmy Rimmer |
Subject: |
RE: How well does CVS handle other types of data? |
Date: |
Fri, 13 Jul 2001 12:19:09 -0700 |
> > Given all that you've stated below, it seems that the crux
> of your argument
> > turns on the ability of a file to be "mergable". In my
> unadorned, pooh-like
> > brain, I ask the simple (and rhetorical) question, "why?"
> Why can't I have a
> > simple switch which tells CVS that for this file or this
> directory or this
> > repository, I simply want to turn merging (and all CVS file
> manipulations)
> > *off*. Period. Nothing more.
>
> Well, if you just want to turn off merging completely then you have to
> come up with some way to tell CVS that you've done the merge manually
> and that there are no more conflicts so it's safe for "cvs commit" to
> procede.
Or, you could just use the patch for reserved checkouts:
http://www.cvshome.org/cyclic/cvs/dev-reserve.html
- Re: How well does CVS handle other types of data?, (continued)
- RE: How well does CVS handle other types of data?, Noel L Yap, 2001/07/13
- RE: How well does CVS handle other types of data?, Noel L Yap, 2001/07/13
- RE: How well does CVS handle other types of data?, Noel L Yap, 2001/07/13
- RE: How well does CVS handle other types of data?, Cameron, Steve, 2001/07/13
- RE: How well does CVS handle other types of data?,
Jimmy Rimmer <=
- RE: How well does CVS handle other types of data?, Noel L Yap, 2001/07/13
- Re: How well does CVS handle other types of data?, Noel L Yap, 2001/07/13
- Re: How well does CVS handle other types of data?, Greg A. Woods, 2001/07/13
- Re: How well does CVS handle other types of data?, Paul Sander, 2001/07/13
- Re: How well does CVS handle other types of data?, Greg A. Woods, 2001/07/14
- Re: How well does CVS handle other types of data?, Paul Sander, 2001/07/14
- Re: How well does CVS handle other types of data?, Greg A. address@hidden (Greg A. Woods), 2001/07/14
- Disallowing commits in presence of conflict markers (was Re: How well does CVS handle other types of data?), Paul Sander, 2001/07/14