Re: $Log$ handling

On Wed, 27 Feb 2013, Michael Haggerty wrote:
>Short answer: if you have been diligent about marking your binary files as
>binary in CVS (i.e., with the "-kb" option), then use cvs2git's
>"--default-eol=native" option.  If not, you've got a more complicated
>problem.

Just for the group's info (if anybody else reads this group, and/or for the
archives)... Adding that got me to running it as:

/Users/Shared/cvs2svn-2.4.0/cvs2svn --use-cvs --encoding=UTF-8 --default-eol=native --dumpfile=cvs2svn-dump /tmp/PROJECT

and that got me down to the following kind of diff on a lot of files (filenames
sanitized)

diff -r PROJECT-444.cvs/XXX.subproj/ZZZ.cp
PROJECT-444.svn/XXX.subproj/ZZZ.cp
12c12
<               $Log: ZZZ.cp,v $
---
>               $Log$

That was on a tag, and the same diff happens at TOT.  I will likely remove the
$Log$ at TOT in CVS before doing the 'real' conversion, so then TOT will
match.. But I wanted to be a perfectionist and have all of the tags match
exactly to what we submitted to the OS builds for example.  On an internal
list, people basically said ignore it, and that's probably what I will end up
doing.  If anybody has any other clever ideas, that'd be great.

I *did* think I could do a fairly quick scan through with a Python script
(someone who knows regular expressions better can probably do it with a one
liner), and replace any instance of $Log$ with the 'argument' on the File: 
line that most recently preceeded it.  That is, change
$Log$
to 
$Log: FILENAME,v $

Then it was brought to my attention that Content-length: would no longer
be accurate, and I haven't yet figured out (and may give up on, as I said
above) how to do that part.  Having this part work for cvs2svn would be
totally awesome though.

>> (As for the other problem I had, I still haven't figured that one out.. I'm
>> just removing that test from my local copy of the repository before I run
>> cvs2svn.. Strangely, there is another file with a space in it, and my cvs is
>> _not_ a shell script.. so there does seem to be something stranger going on,
>> but I haven't been able to figure it out.)
>
>Please dig into it.  Does the same problem occur if you convert just the
>single file?  If so, please submit that file (with proprietary
>information removed, if necessary) along with the supporting information
>needed to make a usable bug report [1].

So far I dug into it a very little bit.  I removed the rest of my repository
except this one subfolder, and I was still able to reproduce the problem.
(At TOT, it's actually in Attic, because after asking the owners of that one
folder, they had already moved it so didn't care if I nuked it from TOT.  It
obviously still exists in the tags in the history.  Removing the folder 
altogether let me do the initial cvs2svn attempts.)

After running destroy_repository.py on my truncated copy of the repository,
it no longer happens.  I'll go read the FAQ some more at some point and see
if I can destroy the confidential info manually somehow but still have the
problem occur.

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=3050400

To unsubscribe from this discussion, e-mail: [[email protected]].