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

AW: disable merge on update

From: <Oliver.Glatz_at_dm-drogeriemarkt.de>
Date: 2005-11-18 22:37:24 CET

> Von: Gale, David [mailto:David.Gale@Hypertherm.com]
> Gesendet: Freitag, 18. November 2005 17:10
> An: Glatz, Oliver; users@subversion.tigris.org
> Betreff: RE: disable merge on update
> Oliver.Glatz@dm-drogeriemarkt.de wrote:
> > Hi,
> >
> > I know that there was already a thread about this. But I
> wasn't able
> > to realize the fix. Our SVN-Server is running on Windows
> and I want to
> > disable merge on udpate-situation.
>> [...]
> The easiest solution would be to set svn:needs-lock on all
> files, rather than changing the mime-type. This is a good
> idea to do for binary files, at the least.

We need this solution for java-Files (i.e. for files with code).
We want to work with merging (not locking), because when you work with
you can work more fluently. Youz don't care about a lock while
You change any file (in java: class) you want and when you are finished
you commit your changes.
And when you want to transfer your fixes from a branch to the trunk you
have to merge anyway.

> Still, I must ask, why do you feel a need to disable merging?
> The vast majority of the time, it does the right thing; the
> remainder of the time, having the developer test the result
> of the merge will reveal any problems.

That's right, but in my opinion there is a risk anyway and I prefer to
notice problems while merging. When your tests fail you have to search
for the reason.

Regards Oliver Glatz

> And, as I stated in
> the other thread, if your developers are stepping on each
> other's toes, trying to fix the same problem in different
> manners, the issue is actually with communication between
> developers--they should be working on separate issues.
> (Otherwise you end up duplicating work, which is wasteful.)
> -David

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 18 22:39:12 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.