subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ivan Zhakov <i...@visualsvn.com>
Subject Re: svn: E195016: merge error is dropping last character of path
Date Sat, 14 Sep 2013 08:37:53 GMT
On Wed, Sep 11, 2013 at 5:19 PM, Andrew Reedick
<Andrew.Reedick@cbeyond.net> wrote:
> 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
Hi, Andrew.

Could you check value of svn:mergeinfo properties on /portal/trunk and
/portal/trunk/config in repository AND working copy to identify where
merge info was corrupted. Thanks!


-- 
Ivan Zhakov

Mime
View raw message