[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: Johnson, Rick <JohnsonR_at_gc.adventist.org>
Date: 2005-03-21 23:22:33 CET

I'm sorry if I wasn't clear. I don't want to remove it from the
repository completely, just wondering if it's possible to get the code
back to a working state without making both Becky and Rick
re-enter/re-edit their respective changes.

Rick

> -----Original Message-----
> From: Patrick Burleson [mailto:pburleson@gmail.com]
> Sent: Monday, March 21, 2005 5:12 PM
> To: Johnson, Rick
> Cc: Subversion Users List
> Subject: Re: Usage for removing bad code
>
> 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:03 2005

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