[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-02 16:58:31 CET

Ben Collins-Sussman wrote:
> What you want to do is apply a patch to the working copy so that the
> result "looks" like the old revision. After applying the patch, the
> working copy will have many edited files, and then 'svn commit' will work.
> Read about using 'svn merge' to remove changes in chapter 4. There's a
> whole section on it.

Just for my understanding of things:
1 - I change a huge file into a tiny one (deleting the contents of the
file, but not the file itself)
2 - I commit that change (rev 100)
3 - I want to undo that change, so I do svn merge 100:99
4 - I commit that change (rev 101)

Now, the (huge) data of that file is in the repository *twice*, right?
Once for the initial checkin, and once for the "undo" (because there is
no merge tracking, so the commit in step 4 cannot distinguish between
step 3 and the alternative: manually replacing the tiny file with the
old huge file)

Also, it seems that after this "undo", the blame info is gone: all lines
were changed during the last commit.

Is this a correct representation of things? Is there a better way to undo?


Roel Harbers

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Feb 2 17:01:32 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.