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

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

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: Mon, 7 Jan 2008 13:05:52 +0100

On 1/7/08, Peter Mb <mb.peter_at_yahoo.com> wrote:
> 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"
> }
> }
> };

Please don't use HTML mail to public mailing lists exactly because of
the above (it's what GMail does to your mail; presumably it wasn't
intentionally added by you when you composed the mail...)

Thanks in advance,

Erik.

---------------------------------------------------------------------
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 13:06:17 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.