tags:

views:

25

answers:

0

Hi,

We have a cvs repository at work which we can't change right now but i want to use Git locally. I don't need anything fancy (in terms of cvs import). What i have done is checkout the cvs repository into a directory, then make that directory a git repository. After which i committed all the cvs files into the git repository.

However i am noticing a problem when switching git branches. Details of steps:

cd workingDirectory
cvs co .
git init
git config core.autocrlf false
// note that i have tried excluding CVS directories from the add using .gitignore
// as well as adding/committing the CVS directories to git both with the same end
// result (explained after this code section)
git add .
git commit
// at this point cvs reports no modified files and git reports all up to date

// create a new branch from master
git -b newBranch
cvs co -r newBranch
git add .
git commit
// at this point cvs reports no modified files and git reports all up to date

//after the following command is where i see differences in files
git co master
cvs diff someFileName

The problem i notice is that some of the files are reported as changed by cvs diff. It seems that there are no actual changes in the file though cvs diff says that the files are different on one or more lines. I'm guessing this is related to newlines or whitespace and how git treats them.

If anybody has any ideas i would really appreciate the help. I really want to start using git locally, but i can't with this issue.

Thanks!