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

Should a locally modified, remotely removed file be handled as a conflict in an update?

From: Peter Mb <mb.peter_at_yahoo.com>
Date: Mon, 7 Jan 2008 03:47:59 -0800 (PST)

var YAHOO = {'Shortcuts' : {}};
YAHOO.Shortcuts.hasSensitiveText = true;
YAHOO.Shortcuts.sensitivityType = ["sensitive_news_terms"];
YAHOO.Shortcuts.doUlt = false;
YAHOO.Shortcuts.location = "us";
YAHOO.Shortcuts.document_id = 0;
YAHOO.Shortcuts.document_type = "";
YAHOO.Shortcuts.document_title = "Should a locally modified, remotely removed file be handled as a conflict in an update?";
YAHOO.Shortcuts.document_publish_date = "";
YAHOO.Shortcuts.document_author = "mb.peter_at_yahoo.com";
YAHOO.Shortcuts.document_url = "";
YAHOO.Shortcuts.document_tags = "";
YAHOO.Shortcuts.annotationSet = {
"lw_1199704212_0": {
"text": "This may",
"extended": 0,
"startchar": 309,
"endchar": 316,
"start": 309,
"end": 316,
"extendedFrom": "",
"predictedCategory": "",
"predictionProbability": "0",
"weight": 1,
"type": ["shortcuts:/us/instance/identifier/month_only"],
"category": ["IDENTIFIER"],
"context": "but keeps its original filename This may lead to several problems A",
"metaData": {
"isoEndDate": "",
"isoStartDate": "20080501T100000",
"past": "false",
"recurring": "false"
"lw_1199704212_1": {
"text": "Yahoo! Search",
"extended": 0,
"startchar": 1811,
"endchar": 1823,
"start": 1811,
"end": 1823,
"extendedFrom": "",
"predictedCategory": "ORGANIZATION",
"predictionProbability": "0.402845",
"weight": 0.35,
"type": ["shortcuts:/us/instance/organization/company/yahoo_property"],
"category": ["ORGANIZATION"],
"context": "deals Find them fast with Yahoo Search http://tools.search.yahoo.com/newsearch/category.php?category=shopping",
"metaData": {
"yprop_name": "Yahoo! Search",
"yprop_url": "http://search.yahoo.com/"
"lw_1199704212_2": {
"text": "http://tools.search.yahoo.com/newsearch/category.php?category=shopping",
"extended": 0,
"startchar": 1929,
"endchar": 1998,
"start": 1929,
"end": 1998,
"extendedFrom": "",
"predictedCategory": "",
"predictionProbability": "0",
"weight": 1,
"type": ["shortcuts:/us/instance/identifier/hyperlink/http"],
"category": ["IDENTIFIER"],
"context": "them fast with Yahoo Search http://tools.search.yahoo.com/newsearch/category.php?category=shopping",
"metaData": {
"linkHref": "http://tools.search.yahoo.com/newsearch/category.php?category=shopping",
"linkProtocol": "http",
"linkTarget": "_blank"

Hello all,

Recently I noticed that when one has modified a file locally and does
 an update when someone else has removed or moved the file to another
 directory and commited, the locally modified file is no longer marked is
 being under svn control but keeps its original filename.

This may lead to several problems:

- A file may have become obsolete due to a refactoring by one
 developer. This developer removes the file and commits. A second developer
 concurrently adds fucncionallity to the file as part of another refactoring.
 When the latter does an update there are conflicting refactorings. The
 deleted file is not marked as being a part of the conflict, but it
 surely is.

- The file is moved remotely, the developer that has a modified copy
 locally does an update. The subsequent local build fails because of
 doubly defined symbols.

- A developer removes a file by accident, commits, another developer
  does an update, having the removed file modified. The local build
 succeeds. That the repository is in a non-buildable state goes unnoticed
 longer than it should.

Note that even trivial changes,.added white space, an added debugging
 statement, for instance, leads to the last two problems.

My suggestion would be, at he very least, to rename the remotely
 removed file to <filename>.mine, similar to what a failed merge does. This
 way, the conflict stands out and the file no longer takes part in the

Any thoughts on this, please?


This may
Add to Calendar

Never miss a thing. Make Yahoo your home page.

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-07 12:48:25 CET

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.