[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Coflict marker detection proposal
From: |
Pascal Bourguignon |
Subject: |
Re: Coflict marker detection proposal |
Date: |
Wed, 18 Jul 2001 19:01:13 +0200 (CEST) |
> > I think it may be possible for CVS to keep track of which
> > markers it puts in.
> > For example, it can keep the line numbers of these markers
> > somewhere in the CVS
> > subdirectory.
>
> Umm... this may not be a good idea. The user may change other things in the
> conflicted files which will change the line numbers, so that under this
> implementation CVS would "lose" the markers that it had added. However,
> keep in mind that I disagree with Mr. Woods in that I don't think that CVS
> should put any restrictions on the content of files stored within CVS. I
> shouldn't have to adjust my source files in order to accomodate the source
> control system.
>
> On a side note, has anybody ever heard of a development environment where it
> stores its source files in 2-byte Unicode on disk instead of 7-bit ASCII (or
> even variable size like UTF-8)? Wouldn't _that_ just confuse a few
> programs? How about if the first byte of the character is 0x0A? To most
> programs it would probably appear as a binary file.... how would diff3 (and
> its relatives) deal with this? This is still a text file, just not in
> ASCII.
Yep. Some OPENSTEP editor could edit plain Unicode (source) files. Old
ISO-Latin-1 characters are coded in Unicode with their high byte set
to 0. Therefore in such files almost half the bytes are null.
Very nice also, on NEXTSTEP/OPENSTEP, you could compile RTF files :
"MyClass.m.rtf". Most useful to pretty-format the documentation
comments. (The compiler driver would just filter out RTF to ASCII
before compiling).
Now, try to handle CVS merge conflicts on a RTF file in an RTF
editor...
--
__Pascal_Bourguignon__ (o_ Software patents are endangering
() ASCII ribbon against html email //\ the computer industry all around
/\ and Microsoft attachments. V_/ the world http://lpf.ai.mit.edu/
1962:DO20I=1.100 2001:my($f)=`fortune`; http://petition.eurolinux.org/
-----BEGIN GEEK CODE BLOCK-----
Version: 3.1
GCS/IT d? s++:++(+++)>++ a C+++ UB+++L++++$S+X++++>$ P- L+++ E++ W++
N++ o-- K- w------ O- M++$ V PS+E++ Y++ PGP++ t+ 5? X+ R !tv b++(+)
DI+++ D++ G++ e+++ h+(++) r? y---? UF++++
------END GEEK CODE BLOCK------
- Re: Coflict marker detection proposal, (continued)
- Re: Coflict marker detection proposal, Noel L Yap, 2001/07/17
- Re: Coflict marker detection proposal, Noel L Yap, 2001/07/18
- Re: Coflict marker detection proposal, Noel L Yap, 2001/07/18
- RE: Coflict marker detection proposal, Kostur, Andre, 2001/07/18
- RE: Coflict marker detection proposal, Noel L Yap, 2001/07/18
- Re: Coflict marker detection proposal,
Pascal Bourguignon <=
- Re: Coflict marker detection proposal, Noel L Yap, 2001/07/19
- Re: Coflict marker detection proposal, Greg A. Woods, 2001/07/19
Re: Coflict marker detection proposal, Noel L Yap, 2001/07/19
Re: Coflict marker detection proposal, Noel L Yap, 2001/07/19
Re: Coflict marker detection proposal, Noel L Yap, 2001/07/20