[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Prevent auto merging of modified files?

From: Aniruddha Apte <aniapte_at_gmail.com>
Date: 2005-02-08 14:49:30 CET

Hello Tom,

I am not sure I understood you completely. If a user is working on a
file and then if that file becomes outdated on the server, the user
has to update his working copy (and merge if required) before
commiting, else the commit is not allowed.

-anir

On Mon, 7 Feb 2005 10:17:02 -0800, Tom Mornini <tmornini@infomania.com> wrote:
>
> 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.
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 8 14:51:47 2005

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.