RE: svn merge failed
> -Original Message- > From: wuzhouhui [mailto:1530108...@qq.com] > Sent: donderdag 26 oktober 2017 07:36 > To: users@subversion.apache.org > Subject: svn merge failed > > Hi, > > I run "svn merge" in my working copy, but I got > > svn: E27: 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
Re: svn merge failed
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:1530108...@qq.com] Sent: donderdag 26 oktober 2017 07:36 To: users@subversion.apache.org Subject: svn merge failed Hi, I run "svn merge" in my working copy, but I got svn: E27: 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
Re: svn merge failed
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.
Re: svn merge failed
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: E24: 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.
Re: svn merge failed
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: E24: 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.
SVN Hackathon 2017 - Meet-and-Greet event
Hi, the Apache Subversion project organizes a yearly hackathon for its project members. This year we are planning something special during that event for the community as well: A meet-and-greet event. If you always wanted to talk to us in person, get to know the faces behind the names on the mailing lists, or want to discuss some SVN features/issues in person, this is your chance. The meet-and-greet event will happen on November 23rd in Aachen at 8pm local time (UTC: +02:00). You are invited to join us there for dinner (or just to have a drink). Unfortunately, we can't cover your expenses and you'd have to pay your food/drinks yourself. The exact location will be announced around November, 9th 2017. The event also provides you with the possibility to extend your PGP key's web of trust (i.e. the event will also serve in parallel as a key-signing event). If you are interested in joining us, please send me a PM and whether you are planning to have dinner there as well (or just come over for a drink), so I can make sure we get a proper location which is large enough for all of us. Regards, Stefan smime.p7s Description: S/MIME Cryptographic Signature
Re: SVN Hackathon 2017 - Meet-and-Greet event
On 26.10.2017 22:34, Stefan wrote: > The meet-and-greet event will happen on November 23rd in Aachen at 8pm > local time (UTC: +02:00). On 23rd November it will be UTC+01:00, daylight savings time in the EU ends this Sunday, 29th October. -- Brane
Re: SVN Hackathon 2017 - Meet-and-Greet event
[Restoring all Cc:] On 26.10.2017 22:34, Stefan wrote: > The meet-and-greet event will happen on November 23rd in Aachen at 8pm > local time (UTC: +02:00). On 23rd November it will be UTC+01:00, daylight savings time in the EU ends this Sunday, 29th October. -- Brane
SVN Move/rename doesn't appear to like absolute paths for SRC
Hi, I brought this up back in 2014 ( https://svn.haxx.se/users/archive-2014-05/0115.shtml). I managed to work around it but just ended up running into it again. I'm running SVN 1.8.13. C:\Project_files\wc1>svn rename C:\project_files\wc1\foo.c bar.c svn: E155004: Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details) svn: E155004: Working copy 'C:\Project_files\wc1' locked. svn: E155004: 'C:\Project_files\wc1' is already locked. C:\Project_files\wc1>svn rename foo.c bar.c A bar.c D foo.c Can anyone else confirm this is an issue before I cross it over to dev? Thanks, Dan
Re: svn merge failed
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: E24: 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.
