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?

[Bert Huijben]

-----Original Message-----
Sent: donderdag 26 oktober 2017 07:36
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

[wuzhouhui]

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

Post by Bert Huijben

-----Original Message-----
Sent: donderdag 26 oktober 2017 07:36
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

[Stefan Sperling]

Post by wuzhouhui
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.

[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

Post by Stefan Sperling

Post by wuzhouhui
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.

[Stefan Sperling]

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

Correct. Sorry about that.

Post by wuzhouhui
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.

[wuzhouhui]

Post by Stefan Sperling

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

Correct. Sorry about that.

Post by wuzhouhui
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.