> "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
>
Karl,
I just tried this, and it doesn't work. The reason is that the diff step
compares the already-merged version of foo.txt with the version in the
repository that was changed by someone else. The local working copy,
pre-merge version, is lost. There is no way to identify which lines were
modified by someone else after having done "svn up", except by trying to
remember and looking at the code.
Unless I'm totally wrong, which has happened in the past. ;)
--- Eric
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Aug 18 18:09:11 2003