> -Original Message-
> From: Stefan Sperling [mailto:s...@elego.de]
> Sent: Monday, September 16, 2013 5:35 AM
> To: Andrew Reedick
> Cc: Goor, Stefan; users@subversion.apache.org
> Subject: Re: SVN merge attempting to reintegrate on a merge to a branch
>
> On Fr
Hi Stefan,
I tried the fix below and it solved the issue of the truncated path in the
missing ranges section:
$ svn merge ^/trunk/my_project .
svn: E195016: Reintegrate can only be used if revisions 4401 through 4598
were previously merged from
https://our.svn.servername/REPO/branches/my_project/
Hi Stefan,
That makes sense, my understand of the process was a bit off but I see
what you mean.
I'm currently looking to test the fix you sent for the client. I will
respond as soon as I have tested it.
Many Thanks for your help,
Stefan
On 16/09/2013 15:33, "Stefan Sperling" wrote:
>On Mon,
On Mon, Sep 16, 2013 at 12:06:46PM +, Goor, Stefan wrote:
> I think the fact the error related to doing a reintegrate merge is also
> wrong. Given that the merge was from a trunk project (that the branch was
> created from) to the the branch, should it not have been attempting a
> regular merg
On Mon, Sep 16, 2013 at 11:51:30AM +, Goor, Stefan wrote:
> Sorry for that, I should have spotted the missing slash! The local merge
> gave the same result:
>
> C:\Users\Administrator\my_project_branch>C:\csvn\bin\svn merge
> "file:///C:/csvn/data/r
> epositories/REPO/trunk/my_project" .
> sv
Hi Stefan,
In your earlier email you mentioned:
>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.
I think the fact the error related to doing a rein
Hi Stefan,
On 16/09/2013 12:41, "Stefan Sperling" wrote:
>On Mon, Sep 16, 2013 at 11:31:09AM +, Goor, Stefan wrote:
>> Hi Stefan,
>>
>> Thanks for your email.
>>
>> The out put of those commands is below:
>[...]
>
>Assuming the output was sanitised correctly, it looks ok.
Yes I sanitise
On Mon, Sep 16, 2013 at 11:31:09AM +, Goor, Stefan wrote:
> Hi Stefan,
>
> Thanks for your email.
>
> The out put of those commands is below:
[...]
Assuming the output was sanitised correctly, it looks ok.
> I tried to run the checkout on the server using the file:// protocol but
> it won
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/
On Mon, Sep 16, 2013 at 10:03:36AM +, 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
Hi Stefan,
I just saw your message so I won't post to the dev list just yet. These
are the details I was going to post:
--START--
We are using Apache 1.8.0 clients, CollabNet Subversion native binaries
1.8.1 (and CollabNet Subversion Edge 4.0.1). I am working on OSX 10.8.4
and
On Fri, Sep 13, 2013 at 04:16:17PM -0400, Andrew Reedick wrote:
> > -Original Message-
> > From: Goor, Stefan [mailto:sg...@thetasgroup.com]
> > Is this a bug? Is it something we are doing wrong? Is there any
> > information we could send that would help diagnose and prevent the
> > issue
On 13/09/2013 21:16, "Andrew Reedick" wrote:
>
>
>> -Original Message-
>> From: Goor, Stefan [mailto:sg...@thetasgroup.com]
>> Sent: Friday, September 13, 2013 3:53 PM
>> To: Andrew Reedick; users@subversion.apache.org
>> Subject: Re: SVN mer
> -Original Message-
> From: Goor, Stefan [mailto:sg...@thetasgroup.com]
> Sent: Friday, September 13, 2013 3:53 PM
> To: Andrew Reedick; users@subversion.apache.org
> Subject: Re: SVN merge attempting to reintegrate on a merge to a branch
>
> Hi Andrew,
>
&g
org
>> Subject: SVN merge attempting to reintegrate on a merge to a branch
>>
>>
>> Recently when we attempted to merge a trunk project to a branch (in
>>preparation of doing a merge of the branch back to trunk) we are got
>>errors like the following:
>>
>> $
> From: Goor, Stefan [mailto:sg...@thetasgroup.com]
> Sent: Friday, September 13, 2013 11:40 AM
> To: users@subversion.apache.org
> Subject: SVN merge attempting to reintegrate on a merge to a branch
>
>
> Recently when we attempted to merge a trunk project to a branch
Hi,
We are encountering an issue when trying to merge trunk to a branch. We
originally posted this issue to the CollabNet forums
(http://subversion.open.collab.net/ds/viewMessage.do?dsForumId=4&dsMessageId=499929)
but they suggested we should contact this list.
We maintain a few branches from
17 matches
Mail list logo
