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

Re: undo commit of added "New Folder"?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-03-22 17:36:55 CET

On Mon, 2004-03-22 at 10:02, Jan Hendrik wrote:

> > The answer is to compare the *parent* directory in r317 with the
> > parent directory in r316, and to apply the merge to the parent
> > directory in your working copy.
>
> Trying this in dry-run mode it would undo all other modifications in any of the
> other folders, too. The whole commit that is.

That's correct. Chapter 4 talks about this: you can always 'svn
revert' the extra local mods if the merge creates too many.

> From the book I understood that
> merge accepts single files:
>
> $ cd myproj
> $ svn merge -r 30:31 thhgttg.txt
> U thhgttg.txt

Yeah, this only works on single files, and only with a working copy
target of implicit "."

> Well, as then there is no practical way to get rid of
> those New Folder thing (except for the big gun svndumpfilter perhaps) without
> losing everything else of that commit I'll leave them there

This isn't such a big deal. Just 'svn rm URL', or 'svn rm' the folders
from your working copy and commit. Reverse merges are only one type of
hammer... stop trying to use them for every nail you see. :-)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Mar 22 17:37:18 2004

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