subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Goor, Stefan" <SG...@thetasgroup.com>
Subject Re: SVN merge attempting to reintegrate on a merge to a branch
Date Mon, 16 Sep 2013 11:31:09 GMT
Hi Stefan,

Thanks for your email.

The out put of those commands is below:

$ svn propget svn:mergeinfo ^/trunk/my_project
/branches/my_project/features/other_branch_1:3057-3653
/branches/my_project/features/other_branch_2:2197-3641
/branches/my_project/features/other_branch_3:3774-3932
/branches/my_project/features/other_branch_4:2093-3661
/branches/my_project/features/other_branch_5:3693-3766
/branches/my_project/features/other_branch_6:3962-4304
/branches/my_project/features/other_branch_7:3945-4220,4223-4398
/branches/my_project/features/other_branch_8:3214-4181
/branches/my_project/features/other_branch_9:1204-2255
/branches/my_project/features/other_branch_10:3280-3940
/branches/my_project/features/my_project_branch:4401-4533  //this is the
branch with the issue
/branches/my_project/features/other_branch_11:294-1048
/branches/my_project/features/other_branch_12:294-1214
/branches/my_project/features/other_branch_13:583-808
/branches/my_project/features/other_branch_14:3220-3634
/branches/my_project/features/other_branch_15:4002-4385
/branches/my_project/features/other_branch_16:4175-4314
/branches/my_project/features/other_branch_17:4172-4292
/branches/my_project/features/other_branch_18:2356-2911
/branches/my_project/patches/patch_1:296-4579
/branches/my_project/patches/patch_2:825-942
/branches/my_project/patches/patch_3:1154,1222-4580
/branches/my_project/patches/patch_4:1533-1932
/branches/my_project/patches/patch_5:2538-4581
/branches/my_project/patches/patch_6:3181-3277
/branches/features/old_branch_1:55-293
/branches/features/old_branch_2:80-293
/branches/patches/old_patch_1:33-295

$ svn propget svn:mergeinfo
^/branches/my_project/features/my_project_branch
/branches/my_project/features/other_branch_1:3057-3653
/branches/my_project/features/other_branch_2:2197-3641
/branches/my_project/features/other_branch_3:3774-3932
/branches/my_project/features/other_branch_4:2093-3661
/branches/my_project/features/other_branch_5:3693-3766
/branches/my_project/features/other_branch_6:3962-4304
/branches/my_project/features/other_branch_7:3945-4220,4223-4398
/branches/my_project/features/other_branch_8:3214-4181
/branches/my_project/features/other_branch_9:1204-2255
/branches/my_project/features/other_branch_10:3280-3940
/branches/my_project/features/other_branch_11:294-1048
/branches/my_project/features/other_branch_12:294-1214
/branches/my_project/features/other_branch_13:583-808
/branches/my_project/features/other_branch_14:3220-3634
/branches/my_project/features/other_branch_15:4002-4385
/branches/my_project/features/other_branch_16:4175-4314
/branches/my_project/features/other_branch_17:4172-4292
/branches/my_project/features/other_branch_18:2356-2911
/branches/my_project/patches/patch_1:296-3919
/branches/my_project/patches/patch_2:825-942
/branches/my_project/patches/patch_3:1154,1222-3920
/branches/my_project/patches/patch_4:1533-1932
/branches/my_project/patches/patch_5:2538-3921
/branches/my_project/patches/patch_6:3181-3277
/branches/features/old_branch_1:55-293
/branches/features/old_branch_2:80-293
/branches/patches/old_patch_1:33-295
/trunk/my_project:4401-4525


$ svn propget svn:mergeinfo working_copy_of_trunk_my_project
/branches/my_project/features/other_branch_1:3057-3653
/branches/my_project/features/other_branch_2:2197-3641
/branches/my_project/features/other_branch_3:3774-3932
/branches/my_project/features/other_branch_4:2093-3661
/branches/my_project/features/other_branch_5:3693-3766
/branches/my_project/features/other_branch_6:3962-4304
/branches/my_project/features/other_branch_7:3945-4220,4223-4398
/branches/my_project/features/other_branch_8:3214-4181
/branches/my_project/features/other_branch_9:1204-2255
/branches/my_project/features/other_branch_10:3280-3940
/branches/my_project/features/my_project_branch:4401-4533  //this is the
branch with the issue
/branches/my_project/features/other_branch_11:294-1048
/branches/my_project/features/other_branch_12:294-1214
/branches/my_project/features/other_branch_13:583-808
/branches/my_project/features/other_branch_14:3220-3634
/branches/my_project/features/other_branch_15:4002-4385
/branches/my_project/features/other_branch_16:4175-4314
/branches/my_project/features/other_branch_17:4172-4292
/branches/my_project/features/other_branch_18:2356-2911
/branches/my_project/patches/patch_1:296-4579
/branches/my_project/patches/patch_2:825-942
/branches/my_project/patches/patch_3:1154,1222-4580
/branches/my_project/patches/patch_4:1533-1932
/branches/my_project/patches/patch_5:2538-4581
/branches/my_project/patches/patch_6:3181-3277
/branches/features/old_branch_1:55-293
/branches/features/old_branch_2:80-293
/branches/patches/old_patch_1:33-295



$ svn propget svn:mergeinfo working_copy_of_branches_my_project
/branches/my_project/features/other_branch_1:3057-3653
/branches/my_project/features/other_branch_2:2197-3641
/branches/my_project/features/other_branch_3:3774-3932
/branches/my_project/features/other_branch_4:2093-3661
/branches/my_project/features/other_branch_5:3693-3766
/branches/my_project/features/other_branch_6:3962-4304
/branches/my_project/features/other_branch_7:3945-4220,4223-4398
/branches/my_project/features/other_branch_8:3214-4181
/branches/my_project/features/other_branch_9:1204-2255
/branches/my_project/features/other_branch_10:3280-3940
/branches/my_project/features/other_branch_11:294-1048
/branches/my_project/features/other_branch_12:294-1214
/branches/my_project/features/other_branch_13:583-808
/branches/my_project/features/other_branch_14:3220-3634
/branches/my_project/features/other_branch_15:4002-4385
/branches/my_project/features/other_branch_16:4175-4314
/branches/my_project/features/other_branch_17:4172-4292
/branches/my_project/features/other_branch_18:2356-2911
/branches/my_project/patches/patch_1:296-3919
/branches/my_project/patches/patch_2:825-942
/branches/my_project/patches/patch_3:1154,1222-3920
/branches/my_project/patches/patch_4:1533-1932
/branches/my_project/patches/patch_5:2538-3921
/branches/my_project/patches/patch_6:3181-3277
/branches/features/old_branch_1:55-293
/branches/features/old_branch_2:80-293
/branches/patches/old_patch_1:33-295
/trunk/my_project:4401-4525


I tried to run the checkout on the server using the file:// protocol but
it won't allow me to use it as I got the following error:

C:\Users\Administrator> C:\csvn\bin\svn co
"file://C:/csvn/data/repositories/REPO"
svn: E180001: Unable to connect to a repository at URL
'file://C:/csvn/data/repositories/REPO
svn: E180001: Unable to open an ra_local session to URL
svn: E180001: Unable to open repository
'file://C:/csvn/data/repositories/REPO'

I suspect that is is due to the fact we are using the CollabNet Subversion
Edge Server and I think the file:// protocol may be disabled by default.
I could not see any obvious settings to enable this.  I will have to see
if I can get the local file protocol working and send the information when
I have it.

Many Thanks,
Stefan





On 16/09/2013 11:33, "Stefan Sperling" <stsp@elego.de> wrote:

>On Mon, Sep 16, 2013 at 10:03:36AM +0000, Goor, Stefan wrote:
>> I'm not sure I understand what you mean by "Does the corruption happen
>> also if you use file:// URLs on the server during checkout/merge,
>>instead
>> of http:// ?".  Our SVN server is remote to our development machine so
>>the
>> only way I do the merge is using a URL with http:// into a local working
>> copy (WC) so that I can resolve in the WC any conflicts before
>>committing.
>>  Could explain a bit more what you mean by this so I can send on some
>>more
>> information?
>
>We want to know why you are seeing:
>
>>     Missing ranges: /trunk/my_projec:4485
>
>which lacks a trailing 't' in the path name.
>
>That's the only obviously wrong thing in your problem report.
>
>Now, to figure out where this 't' is snipped off, we want you to give
>us information that narrows down the circumstances of the problem.
>
>We'd like to see:
>
>- Output of 'svn propget svn:mergeinfo ^/trunk/my_project'
>- Output of 'svn propget svn:mergeinfo ^/branches/my_project'
>
>The above two commands are using URLs, they return server-side
>information.
>
>- Output of 'svn propget svn:mergeinfo working_copy_of_trunk_my_project'
>- Output of 'svn propget svn:mergeinfo
>working_copy_of_branches_my_project'
>
>The above two commands are using working copy paths, they return
>client-side information.
>
>Any difference (or non-difference) between these outputs will help us
>narrow down which layer of the system is introducing mergeinfo which
>lacks the trailing character of the pathname. Based on that information
>we can determine further diagnostics.
>
>If you could try the merge on the server itself, using a file:// URL to
>access the repository, we can tell whether the issue happens only if
>HTTP is involved. This is an important test since the HTTP layer
>in Subversion 1.8 is very from Subversion 1.7, see
>http://subversion.apache.org/docs/release-notes/1.8.html#neon-deleted
>
>For information about what file:// URLs are and how to use them, see
>http://svnbook.red-bean.com/en/1.7/svn.basic.in-action.html#svn.advanced.r
>eposurls
>If you don't have command shell access to the Subversion server,
>performing this test requires help from your server administrators.


Mime
View raw message