Re: svn merge failed

2017-10-26 Thread 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 thi

SVN Move/rename doesn't appear to like absolute paths for SRC

2017-10-26 Thread Dan Ellis
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 lo

Re: SVN Hackathon 2017 - Meet-and-Greet event

2017-10-26 Thread Branko Čibej
[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

Re: SVN Hackathon 2017 - Meet-and-Greet event

2017-10-26 Thread Branko Čibej
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 Hackathon 2017 - Meet-and-Greet event

2017-10-26 Thread Stefan
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 mail

Re: svn merge failed

2017-10-26 Thread 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: E24: Cannot merge automatica

Re: svn merge failed

2017-10-26 Thread 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: E24: Cannot merge automatically while ignoring mergeinfo On 10/26/2017 05:33 PM, Stefan Sperling wrote: On Thu, Oct 26,

Re: svn merge failed

2017-10-26 Thread 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 t

Re: svn merge failed

2017-10-26 Thread 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:1530108...@qq.com] Sent: donderdag 26 oktober 2017 07:36 To: users@subversion.apache

RE: svn merge failed

2017-10-26 Thread Bert Huijben
> -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