Re: svn up --paranoid

[kf...@collab.net]

"Wadsworth, Eric (Contractor)" <wa...@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

Re: svn up --paranoid

[ja...@jrv.org]

It's common for programs to make a backup of a file before making any
change that is inconvenient to undo.

If an UPDATE merges changes it seems reasonable to leave a foo.c~
around, or some such thing.

> From: kfogel@collab.net
> Date: 18 Aug 2003 10:41:07 -0500
> 
> 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