subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@elego.de>
Subject Re: SVN merge attempting to reintegrate on a merge to a branch
Date Mon, 16 Sep 2013 10:33:17 GMT
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.reposurls
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