[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: Tom Mornini <tmornini_at_infomania.com>
Date: 2005-02-08 17:29:59 CET

Hash: SHA1

On Feb 8, 2005, at 5:49 AM, Aniruddha Apte wrote:

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

Of course! You certainly wouldn't want the changes made in the repo
to just disappear when another developer checks in their new file!

Allowing that is essentially identical to nasty file server shared
code base! Well, at least with Subversion you'd have history.

I have no idea why people are so damn paranoid about merging. I've
never heard anybody that tried it suggest it was a problem, even
those who were nervous (but OPEN MINDED) going into it.

In any case, I gave two possiblities:

1) Don't update working copies. This allows the working copy to remain
    stable while developing locally, and changes are merged and checked
    in when development is done.

2) Work on private branches. This allows checkins anytime, and
    bi-directional merges whenever it is deemed appropriate.

Sounds like #2 is appropriate for your group.

- --
- -- Tom Mornini

Version: GnuPG v1.2.4 (Darwin)


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 8 17:32:26 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.