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
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
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,
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
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
> -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
