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

RE: Making Your Commit Override Others' Changes to Repository

From: Appleton, Will <William.Appleton_at_sedgwickcms.com>
Date: 2007-05-10 20:33:42 CEST

David Gardner wrote:
> Let's say that I've committed a change, and then made my own changes,
> but have not yet committed them.
> My co-worker has updated his code to receive the changes I most
> recently committed. And he's made his own changes. Then he commits
> his.
> If I try to commit, I'll get a conflict.
> But what if I know the changes he committed and know that I just want
> to have my version overwrite what is in the repository (i.e.
> essentially discard his most recent commit).
> What's the best way to do that?

disclaimer: I'm still somewhat new to SVN/TSVN and this list :)

If you've both changed the same lines, when you update your WC to get
his changes, SVN will create conflict files. Just pick up your changes
only, run SVN resolved ("Resolved" menu item) and commit your changes.
Otherwise, copy your file to somewhere outside of WC, update your WC
with his changes and then copy your file over the top of the updated one
in your WC and then commit.

Will Appleton

The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from any computer.

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu May 10 20:35:06 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.