Re: Prevent auto merging of modified files?

Aniruddha Apte wrote:
> Hello Folks,
>
> Is there any way I can tell 'svn update' not to automaticlly merge
> files that have changed in the repository? There arent any command
> options, to do this.
>
> Else wise what would be the correct way to prevent users from
> receiving updates to a file, that if too many may make their changes
> difficult to check. Our users feel that they need a warning before the
> file is auto merged.
>
> Has anyone faced such an issue? If yes, what did you do about it?

You could run svn status -u before updating, so you see what has changed
on the server

Or, you could use "false" as external diff3 command, so all merges fail.

Regards,

Roel Harbers

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Feb 7 14:46:31 2005