cvs2git wrongly deletes files when creating branches

Hello,

as already mentioned in a previous mail, this issue might be related to the 
issue described in the thread 'branch creation uses wrong starting point' 
as of 4 weeks ago.

What I'm seeing is that during the conversion from CVS to Git a file 
incorrectly gets deleted an then added again later, and in addition a 
branch is created at the wrong point.

Here are the details:

---%<---
 > Exactly what version of cvs2svn are you using?

r5122 from the cvs2svn trunk

 > What platform are you using?

Ubuntu 10.04 LTS

 > What python version?

Python 2.6.5

 > What is the exact command line that you used to start the conversion?

See attached archive. It contains a shell script, which when executed 
converts the contained CVS repository to Git. The option file used is also 
included. The repository was created with shrink_test_case.py and 
destroy_repository.py.

 > What happened when you ran the program? Why do you think the behavior 
was wrong?

Cvs2git completed the conversion and Git successfully imported the result. 
But looking at the converted repository, one can see that when creating the 
branch symbol00000, the file dir008/dir007/dir005/dir004/file001 gets 
deleted in commit e882abff9d6e2c77e041052f2650bed0feb90e7e and added again 
in commit 95d899970e0ad4dcb395a2fb2ba8c2cdebe5eba5.

As can be seen from the CVS revision numbers in the files, the branch 
symbol should have been created with commit 
23334f07c8121131c27f48babc0c792b9d955b90 instead, and the file in question 
not deleted.

 > If at all possible, include a test case repository that we can use to 
reproduce the problem.

See attached archive.
--->%---

Thanks in advance,
Markus

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

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