[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: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-05-10 20:07:36 CEST

On 5/10/07, David Gardner <jgg.lists@gmail.com> 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.

No, you'll be rejected because your WC is out of date. It's an
important difference. The conflict, if one exists, will become
apparent when you update your WC to retrieve his changes.

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

Move your changes to another location
Update your WC
Copy your version over the version in your WC
Commit

Alternately, you could do a reverse merge on the file to undo his
changes, then commit your latest version.

---------------------------------------------------------------------
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:07:41 2007

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