Re: Disabling automatic conflict resolution?

Brandon Ehle <azverkan@yahoo.com> writes:

> I'm not sure because I have never tried to do this with Subversion,
> but is it possible to switch to an older version of the file and have
> Subversion automatically unmerge changes from the repository or do you
> have to rely on diff and patch for this?

You can run 'svn up -r REV', where REV is some revision before the
changes, but that won't do quite what you think. By the time the
local mods and the exactly matching repos mods have been merged
together, the net effect is that there are no local mods in those
lines of code. To backup to a previous revision will rollback to the
old version, plus the user's remaining mods, but the fact that she
changed some lines that were also changed by someone else is already
lost.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Aug 18 17:51:17 2003