[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: Roel Harbers <roel_at_roelharbers.nl>
Date: 2005-02-04 08:45:46 CET

Dale Worley wrote:
> 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.

It does not retain blame info of lines that were deleted. All
"undeleted" lines will show as last changed in the last commit (which is
of course correct from svn's pov, but not what I want)

> 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.

Why wouldn't this work with complicated changes? As long as the changes
don't rely on the faulty commit (and if they do, they probably should
not be re-applied anyway,) I think this would work fine.


Roel Harbers

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 4 08:48:18 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.