Re: $Log$ handling

On Wed, 27 Feb 2013, Michael Haggerty wrote:
>On 02/28/2013 02:52 AM, Matt Ackeret wrote:
>> This sure seems like a FAQ, but I can't figure it out.
>> 
>> I'm converting my project with
>> 
>> /Users/Shared/cvs2svn-2.4.0/cvs2svn --use-cvs --encoding=UTF-8 --dumpfile=cvs2svn-dump /tmp/PROJECT
>> 
>> then end up with differences like this:
>> <       $Log: FILE.h,v $
>> <       Revision 1.4  2007/06/06 22:43:53  USER
>> ---
>>>  * $Log: not supported by cvs2svn $
>> 
>> In the Extraction options info for --use-internal-co, it says $Log$ is not
>> handled.  So I thought that meant that in the other two cases (---use-rcs and
>> ---use-cvs), it was handled.
>
>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.

I must still be doing something wrong.  Now I'm back to the original issue, 
of it just showing up as $Log$.

This is what I ran:

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

and this is one of the differences.

diff -r HIServices/CoreDrag.subproj/DragInterface.c HIServices-svn/CoreDrag.subproj/DragInterface.c
12c12
<               $Log: DragInterface.c,v $
---
>               $Log$


Actually, it's slightly better, since I'm not missing the last checkin comment.
But my goal of course is to be able to diff TOT CVS and TOT svn checkout and
have them be the same.

One other file that seems to be diffing wrong is a .lisp file, but maybe
that should be binary.. it seems like I'm getting the entire file shown
on the svn end of the diff.  This one is only in a Tests folder so is possibly
ignorable.

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

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