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

Re: What to do when stuff gets committed to trunk when it shouldn't?

From: jennyw <jennyw_at_dangerousideas.com>
Date: 2005-11-22 18:10:02 CET

Phillip Susi wrote:

> Sounds like you want to do a reverse merge to back out their changes.
> svn merge -r 10:1 will undo the changes done from rev 1-10. You can
> do the merge to your wc, make sure everything looks good, then commit.

Great! That's what I did. It was a lot easier than I thought ... I was
making the problem more complicated in my head. I originally wanted to
back out the bad revisions in trunk completely. After reading a bit I
realized that's not possible (Subversion doesn't delete things from
history). After thinking about it for a bit, I realized that it doesn't
really matter that the additional entries are in the log -- it doesn't
prevent anyone from doing anything. Now if someone had committed a
secret file, I'm not sure what I'd do. Is there anything that can be
done aside from restore from backup (and a bunch of work to get
subsequent changes checked back in)?

> Then you should slap the offending developer around a bit for
> committing broken code. If you want to create a branch with those
> changes, you can do it either before or after backing out the changes
> with the reverse merge with svn copy.

We're all kind of new to Subversion ... I'll chalk it up as a learning
experience. Now I'm feeling so learned! ;-)

Thanks!

Jen

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 22 18:12:52 2005

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