Re: Prevent auto merging of modified files?

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Feb 7, 2005, at 5:25 AM, Aniruddha Apte wrote:

> 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.

You could not run update! If you're trying to make stable changes to
code,
then there's little need to update.

Another option would be actual private branches. Have each developer
work
in a branch, then merge (either direction) when the time is right.

- --
- -- Tom Mornini

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFCB7CezaKkuvKwKvcRAnk5AJ0fl4IRLPjOKV895LJH/o6FRSc70wCcD9ou
NTfxQAMTZ165hqr7V7q9GKA=
=fa5+
-----END PGP SIGNATURE-----

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