Re: svn up --paranoid [was "Disabling automatic conflict resolution" ]

"Wadsworth, Eric (Contractor)" <wadswore@fhu.disa.mil> writes:
> Her lines of code were merged with what was in the repository. If she wants
> to restore this file in her working copy to its state before the "svn up"
> command was executed, she must manually go through the file, line-by-line,
> and remove lines added by the merge process. The original file, premerged,
> is lost (though all of the lines of code are preserved in the merged file,
> they much be manually sorted out).

That's not true. Consider:

   $ svn up
   G foo.txt <-- oh no, repos changes merged into modified local copy
   $ svn diff foo.txt > my-adjusted-changes.txt
   $ svn up -r<EARLIER_REV> foo.txt
   G foo.txt
   $

The local changes to foo.txt should be preserved. Even if I'm wrong
about that (I haven't bothered to test it), she could still do the
following at this point:

   $ patch foo.txt < my-adjusted-changes.txt

So it's not hard to get back to the original modified state, if she
really needs to.

-Karl

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