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

Re: undoing a merge

From: Luke Blanshard <luke_at_blanshard.us>
Date: 2003-12-19 03:09:20 CET

Ben Collins-Sussman wrote:

>If your file had local mods before the update, it should still have the
>same local mods after the update (assuming there was no conflict.) Just
>backdate the file to its previous version ('svn up -rPREV foo.c'). Your
>local mods will still be preserved.
Isn't there a small gotcha here? If parts of his local changes matched
the changes from the new version, then wouldn't those be lost?


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 19 03:08:33 2003

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

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