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

Re: Update problem: Tree conflicts vs content conflicts

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-09-08 02:34:17 CEST

Philip Martin <philip@codematters.co.uk> wrote on 09/07/2005 06:28:14 PM:

> I feel you are trying to be too novice-friendly at the expense of more
> convenient behaviour for experienced users.

I do not know if you follow Java programming at all, but in Java the name
and location of the file is significant. The hot trend in the Java world
the last few years is refactoring, which encourages lots of renaming and
restructuring. So I can use an IDE like Eclipse to do a bunch of
refactoring, which results in a lot of svn move ops. Before I commit I
run update. If some of the files I have moved are now scheduled deletions
locally, and those files receive updates from the server, then I should
get some kind of warning/conflict, as whatever updates came down need to
be applied in the moved file.

I imagine that true moves would solve this problem, as the update could
potentially just update the moved file, but failing that, I should get
some kind of local conflict or I will lose changes in the code. I do not
really consider this an issue just for novices. Anyone could get burned
by this, although I will grant you that it is a bit asinine to be doing
this refactoring in the first place without some awareness of what else
might be happening in the tree.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 8 02:34:52 2005

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