subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andrew Reedick <Andrew.Reed...@cbeyond.net>
Subject svn: E195016: merge error is dropping last character of path
Date Wed, 11 Sep 2013 13:19:25 GMT
So... any reason why the last character in paths are getting dropped in the "Missing ranges:
" output?  

Ex:  the "k" is missing from "trunk" in "Missing ranges:
    portal/trunk
    Missing ranges: /portal/trun:4125,4143,4145,4147,4150,4163,4166,4168,4170,4209,4217,4222,4252,4277,4282,4300,4364,4375,4383,4459,4465,4469

Or, maybe the problem is limited to the first entry?  Ex:  the 'g' is getting left off in
the first "Missing ranges".
  portal/trunk/config
    Missing ranges: /portal/trunk/confi:4217,4378,4459
    Missing ranges: /portal/trunk/config:4387,4435,4452

More importantly, if the first pathname is getting mangled, is it affecting how merges are
resolved/calculated?  Or is it just a presentation bug?

This is 1.8.3 cygwin CLI client and in TortoiseSVN 1.8.1.

======================================================
svn: E195016: Reintegrate can only be used if revisions 4109 through 4928 were previously
merged from https://server/some/where/branches/foo to the reintegrate source, but this is
not the case:
  portal/trunk
    Missing ranges: /portal/trun:4125,4143,4145,4147,4150,4163,4166,4168,4170,4209,4217,4222,4252,4277,4282,4300,4364,4375,4383,4459,4465,4469
  portal/trunk/config
    Missing ranges: /portal/trunk/confi:4217,4378,4459
    Missing ranges: /portal/trunk/config:4387,4435,4452
  portal/trunk/doc
    Missing ranges: /portal/trunk/do:4378
  portal/trunk/httpd-config
    Missing ranges: /portal/trunk/httpd-confi:4378
  portal/trunk/private-certs
    Missing ranges: /portal/trunk/private-cert:4378
  portal/trunk/schema
    Missing ranges: /portal/trunk/schem:4209,4217,4378
    Missing ranges: /portal/trunk/schema:4209
  portal/trunk/schema-newbase
    Missing ranges: /portal/trunk/schema-newbas:4217,4364,4378,4459
    Missing ranges: /portal/trunk/schema-newbase:4241,4249-4250,4258-4261,4302,4354,4363-4364,4370,4377,4391,4420,4446-4450
  portal/trunk/scripts
    Missing ranges: /portal/trunk/script:4147,4217,4378,4459
    Missing ranges: /portal/trunk/scripts:4147,4236,4307,4371,4387,4390,4392,4459
  portal/trunk/source
    Missing ranges: /portal/trunk/sourc:4125,4143,4145,4150,4163,4166,4168,4170,4209,4217,4222,4252,4277,4282,4300,4364,4375,4383,4459,4465,4469
    Missing ranges: /portal/trunk/source:4114,4125,4135,4137,4143,4145,4150,4162-4163,4166,4168,4170,4186,4191-4194,4196-4199,4207-4209,4217,4219,4222,4225-4226,4228-4235,4237-4240,4243-4247,4252-4257,4265-4272,4274,4278-4279,4282,4285-4295,4300,4303-4306,4308-4328,4332-4335,4337-4343,4347-4348,4353,4355,4359,4364-4365,4367,4374-4376,4378,4383-4386,4388-4389,4394-4419,4421-4432,4434,4436-4437,4439,4441,4444-4445,4451,4455-4457,4462,4465-4467,4469
  portal/trunk/source/includes/quotebuilder/changeorder_dealer_products_add.php
    Missing ranges: /portal/trunk/source/includes/quotebuilder/changeorder_dealer_products_add.ph:4125,4163,4217,4227,4378
  portal/trunk/wsbin
    Missing ranges: /portal/trunk/wsbi:4277,4378
    Missing ranges: /portal/trunk/wsbin:4273



Andrew Reedick
CBeyond
Cloud Development, SCM
O: 678.486.8163


Mime
View raw message