[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: Phillip Susi <psusi_at_cfl.rr.com>
Date: 2005-11-22 17:30:16 CET

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.

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.

jennyw wrote:
> Someone on our development team spent the night checking in changes. All
> of these changes were checked in to trunk, but they break a lot of
> things. There were about 10 commits overnight ... is there a way to take
> all those revisions and put them into a branch, leaving the trunk the
> same as it was befor the night began?
>
> I read the branching section of the Subversion Book, but I didn't see a
> way to basically take the last 10 changes and call them a branch leaving
> the trunk alone, but I'm still kind of new to Subversion, so the more
> detail, the better.
>
> I read the branching section of the Subversion Book, but I didn't see a
> way to basically take the last 10 changes and call them a branch leaving
> the trunk alone.
>
> Thanks!
>
> Jen
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 22 17:34:24 2005

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