Re: cvsimport woes

From: Rajkumar S <rajkumars@asianetindia.com>
Date: Mar 6, 2006, 16:52 UTC
Message-ID: <440C68B9.9030305@asianetindia.com>
In-Reply-To: <46a038f90603060137o758ea7ch6c40652ad86a102a@mail.gmail.com>

Martin Langhoff wrote:

Show 7 quoted lines

> On 3/6/06, Martin Langhoff <martin.langhoff@gmail.com> wrote:
>> you don't seem to be making any silly mistake. Make sure you are using
>> a recent git, and a recent cvsps. Actually you want the _latest_ cvsps
>> (2.1 I think).
> 
> Scratch this bit, naturally. I wasn't 100% paying attention. Still,
> the rest of the answer should kinda/sorta make sense.

Thanks for your kind replies.

I was also talking to Matthias Urlichs (the author of cvsimport) What he says is that the first version is still checked out because the import does not do the fast-forward/merge by itself.

I am wondering how can I do the fast-forward. I had a long chat in irc but did not find any solution to this particular issue. I tried git merge, but that does not work as the command needs more arguments. (I am a git newbie and git concepts are still bit fuzzy for me)

I would appreciate a lot if some one can point me in the right direction.

If you are not following this thread, the problem I am talking about is that when I do a cvsimport for a second time (ie do a git cvsimport; update the cvs; do a cvsimport again) the second updates are not visible in the current directory, though they are present in the git database.

You can use this script to reproduce this problem.

export CVSROOT=/home/raj/cvsroot rm -rf cvsroot/ git/ src/ /home/raj/.cvsps mkdir cvsroot git src cvs init cd src/ echo "Line one" > file.txt echo "Line one" > file1.txt echo "Line one" > file2.txt cvs import -m "Imported sources" src start realstart cd .. rm -rf src/ cvs co src git cvsimport -v -k -u -m -d $CVSROOT -C git/ src cd git git status cd .. cd src/ echo "Line two" >> file.txt echo "Line two" >> file1.txt cvs commit -m "v2.0" cd .. git cvsimport -v -k -u -m -d $CVSROOT -C git/ src cd git git status cd ..

Now the cvs version of file.txt and git version are different.

Thanks and regards,

raj