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

RE: how to make a previous repository version the actual one?

From: Dale Worley <dworley_at_pingtel.com>
Date: 2005-02-03 17:07:09 CET

If you want to retain changes after a commit to be eliminated, there are
actually two methods.

One is to back out the changes from the commit you don't want, "svn
merge -r100:99 .". It retains the blame information. This probably works
best if the commit was not very complicated.

The other method is to create a branch, and re-apply the changes after the
commit you don't want, "svn cp -r 99 http://... .", "svn merge -r99:HEAD .".
This probably works best if the subsequence changes were not very
complicated.

Hmmm, for automated uses, it might be worth building one WC by each method
and then "diff -r" to see if they differ, to detect where merging did not do
the right thing.

Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 3 17:10:38 2005

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.