> -----Original Message-----
> From: Andrew Reedick 
> Sent: Wednesday, September 11, 2013 9:19 AM
> To: users@subversion.apache.org
> Subject: svn: E195016: merge error is dropping last character of path 
>
> 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


Just confirming that 1.8.4 has fixed the problem:  "* merge: fix path 
corruption during reintegration (r1523666)"

I re-ran my merge and the last letter is no longer being dropped from "trunk" 
and "config", and that "confi" and "config" have been combined back into one 
line.
  portal/branches/dev.bug
     Missing ranges: 
/portal/trunk:4125,4143,4145,4147,4150,4163,4166,4168,4170,4209,4217,4222,4252,4277,4282,4300,4364,4375,4383,4459,4465,4469
  portal/branches/dev.bug/config
    Missing ranges: /portal/trunk/config:4217,4378,4387,4435,4452,4459


Reply via email to