[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: Patrick Burleson <pburleson_at_gmail.com>
Date: 2005-03-21 23:12:04 CET

On Mon, 21 Mar 2005 17:08:46 -0500, Johnson, Rick
<JohnsonR@gc.adventist.org> 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?
>
> I've been using Subversion for more than a year, but always for myself,
> never in a team, till now.
>
> Thanks,
> Rick - A different Rick than the above example. I would NEVER commit
> non-working code. :)
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

I would go into the code, take out the non-working bits, and commit
rev 4. Remember, the SCM should be a complete history of the file: the
good, the bad, and the ugly.

Patrick

---------------------------------------------------------------------
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:28 2005

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