[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Some sync merges no more allowed with 1.8 client ?

From: Daniel Shahaf <danielsh_at_elego.de>
Date: Sat, 6 Jul 2013 19:00:23 +0300

Eric Estievenart wrote on Fri, Jul 05, 2013 at 19:28:30 +0200:
> svn: E205000: Try 'svn help merge' for more information
> svn: E205000: Source and target must be different but related branches
> svn: E205000: Source and target have no common ancestor: 'svn://myserver/app/v1_at_head' and '._at_unspecified'
> (Whereas the sync merge worked flawlessly with all 1.7 clients, with proper merge tracking).

I believe '--ignore-ancestry' is supposed to override this particular check.

The code has changed on 1.8.x_at_HEAD since 1.8.0[1], so 1.8.1 will behave
differently. (It will probably just issue a different error message,
since [1] claims that it didn't change the checks being done.)

Daniel

[1]
% $svn mergeinfo --show-revs=eligible ^/subversion/{branches/1.8.x,tags/1.8.0}/subversion/svn/merge-cmd.c --log
------------------------------------------------------------------------
r1495282 | svn-role | 2013-06-21 04:00:42 +0000 (Fri, 21 Jun 2013) | 14 lines

Merge r1493424 from trunk:

 * r1493424
   Remove unnecessary check for branches ancestry from
   command line client. All required checks are already performed in
   libsvn_client.
   Justification:
     There is no reason to command line and third-party use different
     codepath for ancestory checks. Simple performance fix.
   Votes:
     +1: ivan, rhuijben, julianfoad
     +0: danielsh (note: svn_client__youngest_common_ancestor can be striken;
                         no callers left)
Received on 2013-07-06 18:01:17 CEST

This is an archived mail posted to the Subversion Users mailing list.