no merge

[George Georgalis <ge...@galis.org>]

I'd like svn to block an update rather than merge when I "svn up".
Can I make svn require --force to merge?

Often I work on the same modules from different locations and I
don't always commit (sigh, typically the problem comes up when
I'll have shells from several computers open, each with their own
checkout and I mix up which one I was working on).

Anyway, the diffs aren't hard to merge, but I'd prefer to do them
manually. How can I configure svn to block vs merge on update when
the local copy is not committed? I'd like to configure this at the
repo so other users get the same behavior.

// George


-- 
George Georgalis, systems architect, administrator <IXOYE><

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org