[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: Jan Hendrik <jan.hendrik_at_bigfoot.com>
Date: 2004-03-23 10:44:00 CET

Concerning Re: undo commit of added "New Folde
Ben Collins-Sussman wrote on 22 Mar 2004, 10:36, at least in part:

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

Ah, yes, I see now. At least in theory. :-)

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

Well, I wanted to learn something - at an object that looked
relatively easy and with little risk at a production repository!

Thanks a lot for your help, Ben!

Jan Hendrik
Freedom quote:

     Are you willing to spend time studying the issues,
     making yourself aware, and then conveying that information
     to family and friends? Will you resist the temptation
     to get a government handout for your community?
     Realize that the doctor's fight against socialized medicine is your fight.
     We can't socialize the doctors without socializing the patients.
     Recognize that government invasion of public power
     is eventually an assault upon your own business.
     If some among you fear taking a stand because you are afraid
     of reprisals from customers, clients, or even government,
     recognize that you are just feeding the crocodile hoping he'll eat you last.
                -- Ronald Reagan, October 27, 1964

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Mar 23 10:42:39 2004

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