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

reverting changes to svn-base files

From: Jonathan Manning <jmanning_at_alisa-jon.net>
Date: 2004-05-03 17:49:26 CEST

Hi All,
I've been a lurker on this list since the early days. I've used svn for
many personal projects, and just convinced my fellow programmers at work
to convert our big project over from cvs. No surprises for me, since
I've been using it for a while, and the adjustment is going fairly
smoothly for the others - they are picking it up quickly.

One problem we've encountered is the use of the following idiom:
find . -type f -name \*.pm | xargs perl -pi -e
's/origstring/somenewstring/g'

This is a common way to change a function name or some other string
sitewide.

The problem is, this also changes all the svn-base files in the working
repository. I've tried some other variations (-not -name \*.svn-base
-and -not -name \*.svn-work) (| grep -v .svn |). Hopefully we'll get
used to using these soon, but it's been a difficult habit to break.

In the mean time, we get local changes that aren't identified by
subversion, and are difficult to even find, let alone resolve. To find
them in the first place - we just have to wait until a commit fails with
a md5sum mismatch error. Once that happens, there seems to be no way to
reset the WC except for backing up the files, deleting the entire
directory, updating, and copying the files back in. (which loses any
prop changes)

Is there any svn command that will ignore these local files and force a
full network update? I'd like a command that will just overwrite all the
svn-base files with the data from the repository matching the current WC
revision.

And, on the prevention side, any better idioms for making sitewide changes?

Thanks,

~Jonathan

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 3 17:50:25 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.