[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: Tom Mornini <tmornini_at_infomania.com>
Date: 2005-03-21 23:15:39 CET

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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

> 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 TARGET

> Rick - A different Rick than the above example. I would NEVER commit
> non-working code. :)

Nobody on this list ever would.

In fact, I never have, and I've never known anybody else who ever has
either. :-)

- --
- -- Tom Mornini

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFCP0eLzaKkuvKwKvcRAhUJAJ4vPbw52HS7+gS68V22kbW2p4V4qgCfRG//
FZlm0wcEAmJFHljBO9PKsdQ=
=Qhpz
-----END PGP SIGNATURE-----

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

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