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

Re: Usage for removing bad code

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-03-21 23:23:15 CET

On Mar 21, 2005, at 4:08 PM, Johnson, Rick wrote:

> I have a scenario I'm not sure how to resolve after reading the book.
>
> Rick makes a change to a file and commits: rev 2
> Becky make a change to the same file, updates her WC, and commits: rev
> 3
> After later testing, Becky and Rick find that Rick updated the wrong
> file and his changes need to go.
>
> How do Becky and Rick keep Becky's changes in the repository while
> throwing away Rick's?
>

svn merge -r2:1 URL-to-file file
svn commit -m "removed rick's changeset"

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Mar 22 00:36:00 2005

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