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

Re: [Issue 2897] Reflective merges are faulty

From: Paul Burba <ptburba_at_gmail.com>
Date: Fri, 12 Apr 2013 10:11:20 -0400

On Thu, Apr 11, 2013 at 5:15 PM, <julianfoad_at_tigris.org> wrote:
> http://subversion.tigris.org/issues/show_bug.cgi?id=2897
> User julianfoad changed the following:
> What |Old value |New value
> ================================================================================
> --------------------------------------------------------------------------------
> Resolution| |FIXED
> --------------------------------------------------------------------------------
> ------- Additional comments from julianfoad_at_tigris.org Thu Apr 11 14:15:36 -0700 2013 -------
> Closing as fixed.
> Current trunk (which will become Suversion 1.8) supports merging to-and-fro
> between two branches, automatically performing the right sort of merge
> (reintegrate or not, depending on which direction the previous full merge was)
> to take all the not-yet-merged changes from the source branch to the target
> branch. The release-notes description is at
> <http://subversion.apache.org/docs/release-notes/1.8.html#auto-merge>.
> It is not perfect. For one thing, it does not deal correctly with revisions
> that have been cherry-pick merged between the branches in all cases (it does in
> some cases). However, it solves the basic requirement.

Hi Julian,

Can we really call this fixed? As you point out it does not deal with
cherry pick (and subtree) merges in all cases. Is there another issue
for the aspects that still don't work?

On a practical note, we have a test associated with this issue that is
set to XFail:

merge_tests.py 49 'avoid repeated merges for cyclic merging'

Paul T. Burba
CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development
Skype: ptburba
Received on 2013-04-12 16:11:54 CEST

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