svn merge failed

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

svn merge failed

wuzhouhui
Hi,

I run "svn merge" in my working copy, but I got

svn: E200007: Querying mergeinfo requires version 3 of the FSFS
filesystem schema; filesystem '/home/svn/vsds_source/db' uses only version 2

Subversion client-side version is 1.9.7, while server-side is 1.6.11. In
addition,
Ihavenoadministration access in server, so I can't upgrade server's
subversion.
I knew version 1.6.11 can merge successfully, but I'm wondering if there
exist
other solutions for higher subversion client to merge successfully?
Reply | Threaded
Open this post in threaded view
|

RE: svn merge failed

Bert Huijben-5


> -----Original Message-----
> From: wuzhouhui [mailto:[hidden email]]
> Sent: donderdag 26 oktober 2017 07:36
> To: [hidden email]
> Subject: svn merge failed
>
> Hi,
>
> I run "svn merge" in my working copy, but I got
>
> svn: E200007: Querying mergeinfo requires version 3 of the FSFS
> filesystem schema; filesystem '/home/svn/vsds_source/db' uses only version
> 2
>
> Subversion client-side version is 1.9.7, while server-side is 1.6.11. In
> addition,
> Ihavenoadministration access in server, so I can't upgrade server's
> subversion.
> I knew version 1.6.11 can merge successfully, but I'm wondering if there
> exist
> other solutions for higher subversion client to merge successfully?

This server version knows how to merge, but the filesystem used by this repository is too old to support client requests for these features. The administrator should run 'svnadmin upgrade repository' to bump the format to enable this feature...
For better results he/she should also upgrade the server to a fully supported version but this doesn't help when the filesystem is not upgraded.

Bert

Reply | Threaded
Open this post in threaded view
|

Re: svn merge failed

wuzhouhui
I'm wondering if higher Subversion client can disable some features for
compatible with older Subversion server.


On 10/26/2017 03:25 PM, Bert Huijben wrote:

>
>> -----Original Message-----
>> From: wuzhouhui [mailto:[hidden email]]
>> Sent: donderdag 26 oktober 2017 07:36
>> To: [hidden email]
>> Subject: svn merge failed
>>
>> Hi,
>>
>> I run "svn merge" in my working copy, but I got
>>
>> svn: E200007: Querying mergeinfo requires version 3 of the FSFS
>> filesystem schema; filesystem '/home/svn/vsds_source/db' uses only version
>> 2
>>
>> Subversion client-side version is 1.9.7, while server-side is 1.6.11. In
>> addition,
>> Ihavenoadministration access in server, so I can't upgrade server's
>> subversion.
>> I knew version 1.6.11 can merge successfully, but I'm wondering if there
>> exist
>> other solutions for higher subversion client to merge successfully?
> This server version knows how to merge, but the filesystem used by this repository is too old to support client requests for these features. The administrator should run 'svnadmin upgrade repository' to bump the format to enable this feature...
> For better results he/she should also upgrade the server to a fully supported version but this doesn't help when the filesystem is not upgraded.
>
> Bert
>



Reply | Threaded
Open this post in threaded view
|

Re: svn merge failed

Stefan Sperling
On Thu, Oct 26, 2017 at 04:39:11PM +0800, wuzhouhui wrote:
> I'm wondering if higher Subversion client can disable some features for
> compatible with older Subversion server.

The --no-ancestry option disables merge-tracking on the client.
You could try again with 'svn merge --no-ancestry'.

But the recommended option is to upgrade the repository filesystem
on the server.
Reply | Threaded
Open this post in threaded view
|

Re: svn merge failed

wuzhouhui
There is no option --no-ancestry for subcommand merge, I think option
--ignore-ancestry is what you talk about.

I run "svn merge --ignore-ancestry" and got this:
     svn: E200004: Cannot merge automatically while ignoring mergeinfo

On 10/26/2017 05:33 PM, Stefan Sperling wrote:

> On Thu, Oct 26, 2017 at 04:39:11PM +0800, wuzhouhui wrote:
>> I'm wondering if higher Subversion client can disable some features for
>> compatible with older Subversion server.
>
> The --no-ancestry option disables merge-tracking on the client.
> You could try again with 'svn merge --no-ancestry'.
>
> But the recommended option is to upgrade the repository filesystem
> on the server.
>
Reply | Threaded
Open this post in threaded view
|

Re: svn merge failed

Stefan Sperling
On Thu, Oct 26, 2017 at 05:44:16PM +0800, wuzhouhui wrote:
> There is no option --no-ancestry for subcommand merge, I think option
> --ignore-ancestry is what you talk about.

Correct. Sorry about that.

> I run "svn merge --ignore-ancestry" and got this:
>     svn: E200004: Cannot merge automatically while ignoring mergeinfo

You will have to specify a revision range as well when merging with
merge-tracking disabled: Use the -r or -c option.
Otherwise, SVN cannot know which changes should be merged.
Reply | Threaded
Open this post in threaded view
|

Re: svn merge failed

wuzhouhui
On 10/26/2017 06:21 PM, Stefan Sperling wrote:

> On Thu, Oct 26, 2017 at 05:44:16PM +0800, wuzhouhui wrote:
>> There is no option --no-ancestry for subcommand merge, I think option
>> --ignore-ancestry is what you talk about.
>
> Correct. Sorry about that.
>
>> I run "svn merge --ignore-ancestry" and got this:
>>      svn: E200004: Cannot merge automatically while ignoring mergeinfo
>
> You will have to specify a revision range as well when merging with
> merge-tracking disabled: Use the -r or -c option.
> Otherwise, SVN cannot know which changes should be merged.
>
Thanks, it works.