Re: svn up --paranoid

"Wadsworth, Eric (Contractor)" <wadswore@fhu.disa.mil> writes:
> 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.

Right -- Mike Pilato just explained this to me, sorry for not seeing
it before. (We still don't think it's relevant in real life, but yes,
there is a theoretical point here :-) ).

The 'svn diff' solution works, but it's inconvenient for her to run
'svn diff' before every update. A wrapper script would solve it.

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