[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Checkout/Export without keyword substituion

From: Peter Strempel <zotan_at_web.de>
Date: 2004-09-25 22:09:47 CEST

Jeremy Pereira wrote:
> Since $Id$ is a CVS keyword too, won't CVS just replace the Subversion
> specific expansion with its own expansion? (Going the other way worked
> fine when I migrated from CVS to SVN).

Yes, but keeping the $Id$ in files controlled by both CVS and SVN isn't
the problem by itself.

What I do is:

cvs -p:someremoteserver co -kk myproject

(before) cvs -p:localserver export -r HEAD myproject -kk
(now) svn export repos myproject

cp -a localcopy/myproject remotecopy/myproject
cvs -p:someremoteserver commit -m "Weekly synch"
[go to lunch, might be finished afterwards]

The whole setup is very ugly, but the remote server is so slow I simply
cannot work with this, so I setup a local repos (CVS before, now SVN)
and synch it with the remote CVS server once in a while. Certainly
anyone with a reasonable infrastructure doesn't need to do such a nonsense.

But now when I copy the svn export over the CVS working dir, all files
are marked as modified just because the $Id$ line changed. This makes it
very difficult to merge changes done by other developers. Before when I
used a local CVS, I checked out and exported with -kk, so after the
recursive copy only the real modified files were marked as modified and
it was easy to spot the changes.

The optimal solution for me would be something like:
svn export --pleasedontreplacekeywords repos myproject

The previously suggested solution by Patrick sounds interesting, I will
give it a try.

Thanks,

Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Sep 25 22:10:34 2004

This is an archived mail posted to the Subversion Users mailing list.