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

Re: How to undo a merge / conflict?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-07-06 21:19:25 CEST

On Tue, 2004-07-06 at 12:36, Wadsworth, Eric (Contractor) wrote:
> There is probably a simple answer, I'm just not seeing it.
>
> I edit a file, then update, and a merge or conflict happens. Now I want to
> get my file back to it's pristine state before I did the update, showing
> just my edits. What's the command? How about under TortoiseSVN? The
> TortoiseSVN right-click menu only offers "revert" which says it will throw
> away all my changes.

It depends on the state of your file.

* If your locally modified file received a clean merge ('svn status'
reports it as just 'M'), then just 'svn up -rX' where X is the old
version of the file. Your local mods will be preserved, whether
back-dating or up-dating.

* If your locally modified file is in a state of conflict, then you've
probably got conflict markers mixed in with your changes. You don't
have to resolve the conflicts by hand. Remember that you also have 3
fulltexts sitting in your working copy. Just copy the '.mine' file on
top of your working file.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 6 21:54:01 2004

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