[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge error with SVN 1.8.0

From: Nico Kadel-Garcia <nkadel_at_gmail.com>
Date: Sun, 30 Jun 2013 07:48:35 -0400

On Sun, Jun 23, 2013 at 7:38 PM, Alexey Neyman <stilor_at_att.net> wrote:
> On Sunday, June 23, 2013 07:20:50 PM Nico Kadel-Garcia wrote:
>
>> On Sun, Jun 23, 2013 at 3:56 PM, Alexey Neyman <stilor_at_att.net> wrote:
>
>> > Hi,
>
>> >
>
>> >
>
>> >
>
>> > I've tried upgrading the client to SVN 1.8, and now see some strange
>> > merge
>
>> > errors while reintegrating the branch. According to
>
>>
>
>> Did you delete the old RHEL 1.6.11 RPM, to avoid libraries lying
>
>> around and confusing you? Or binaries turning up in your "commit"
>
>> scripts due to inherited "PATH" that does not include the new version?
>
>
>
> Sorry for being unclear: I only upgraded the CLIENT, not the server. The
> server still has 1.6.11. And yes, sorry for stating the obvious, the 1.7.10
> subversion RPM was removed when I installed 1.8.0.
>
>
>
>> To avoid the fun and games, I urge you to grab and test my newly
>> minted Subversion 1.8.0 RPM building tools, at:
>> https://github.com/nkadel/subversion-1.8.x-srpm
>
> Are you calling RPMs provided by WanDisco's "fun and games"? I think
> Subversion developers employed by WanDisco might be somewhat insulted by
> such judgment. Is there something wrong with RPMs from WanDisco that I must,
> in your opinion, switch to your version?

No, no, I missed that you were using WanDisco RPM's. (Not sure how I
missed that, I do sometimes get interrupted doing my email.) I
respect WanDisco's work and had no intent to insult them. And if
you're using WanDisco, I'd seriously consider a commercial contract
with them to take advantage of their multiple-master tools for
mirroring Subversion repositories safely. That would actually help
*fund* Subversion development.

In fact.... If you can, I'd consider making a copy of the repository
to another host and testing it with the Wandisco or another Subversion
1.8.0 *server*, not just client.

>> I've also bundled a libserf SRPM building toolkit at:
>
>> https://github.com/nkadel/libserf-1.2.x-srpm
>
> Thanks. I thought that my original email indicated that we're using svn://
> protocol and thus serf is out of the equation.

It's cool. I'm not suggesting you have to locally build or compile
serf unless you care to build from my SRPM, It's a dependency for
building a full Subversion 1.8.0 toolkit. If you feel like getting
into the code yourself, you'll need something like it.

In fact...... If you like playing with source and working with your own copies,

> In other words: do you have anything relevant to say regarding the reported
> issue, rather than advertising your work?

I made a mistake about the source of your software, and did apologize.
Since it's from Wandisco, and you're jumping to the bleeding edge with
Subvesion 1.8.x on RHEL 6 based operating systems, why not contact
them for commercial support?
Received on 2013-06-30 13:49:15 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.