[Gnu-arch-users] Re:

[John A Meinel]

address@hidden wrote:
> Hi John,
>
> I decided to stick with tla 1.2.1 as tla 1.2 panicked 
> when I tried to get files from 1.2.1 archives. I did 
> convert *.cpp *.h to LF from CRLF and the diff seems to 
> be working ok. I also tested with a 'tla get ...' in an 
> empty directory and the files it restores are ok and 
> the project compiles from this. The only changed thing 
> is the .vcproj file (which I didn't convert to LF only 
> and comes out as converted to LF), but Visual Studio 
> seems content with this.
>
> By the way : how can I tell tla to store some files as 
> binary ? As in 'store everything except *.cpp, *.h, 
> *.xpm' as binary ... and this after I did 'tla add' for 
> all relevant files ... can't figure from 'tla -H'
>
> Thanks,
> Andrei


Short answer:
Files are supposed to always be "binary". They aren't supposed to be 
modified as a part of commit. (Whatever you commit should be exactly 
what you get.)

That is why it is actually a bug in tla-cygwin-1.2.1. Just realize that 
while *you* might be able to check out your source tree, it is fairly 
likely that someone with a main-line tla will not be able to, as it is 
probably already corrupted. To explain simply, 1.2.1 ignores line 
endings and generates changesets which conflict if you pay attention to 
them. Since all other tla's pay attention to line ending, you get into 
trouble.

I know Lode feels that tla should behave a little more like CVS, where 
it stores the files in the repository as LF, and upon checkout converts 
to CRLF, unless the file is marked as binary. I personally agree with 
Tom Lord's idea that my revision control should keep track of the file I 
give it, and what is in the repository is what I have on disk. I've 
gotten bitten a few times by someone checking in a CRLF file from a unix 
box, so a checkout on Windows becomes CRCRLF. Or forgetting to set the 
binary bit, and trying to checkout a .png after checking it in.

There has been some discussion about how to do it, along with a lot of 
talk about file-encoding, and what permission bits should be kept, etc, 
etc. I don't think a consensus has been reached yet.

I *like* that tla leaves my files alone. Advanced merging almost 
requires it. Unless you define an archive format that all files should 
conform to (say all are LF), or some way to state that *these* files are 
LF, and these files are CRLF, and *these* files are binary, etc.

That's why I would recommend starting over with 1.2 for now, until 1.2.1 
gets fixed. Though I would expect a leap-frog to 1.3, since it's not 
really worth fixing an old one when you can get all the latest features, 
and fix the bugs at the same time.

Lode, unfortunately, is not a very active maintainer, he has his own 
stuff to work on. I *might* get some time to work on it, but I'm a grad 
student who just stopped working part-time so I could focus more on my 
dissertation. Not a good time for me to get distracted again. :)

John
=:->

signature.asc
Description: OpenPGP digital signature