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

svn-mergeinfo-normalizer ideas

From: Stefan Hett <stefan_at_egosoft.com>
Date: Thu, 25 Jun 2015 17:10:26 +0200

Hi,

I'm dealing with one remaining case svn-mergeinfo-normalizer normalize
doesn't seem to be able to handle yet. Would it be possible to add
support for this?

Case: Eliminate incorrect mergeinfos of pre-branch-revisions.

Looking at the following output:
Trying to elide mergeinfo from path
     E:/[projects]/XR/clean_source_branch/src/SDKs/bullet
     into mergeinfo at path
     E:/[projects]/XR/clean_source_branch/src

     All branches still exist in HEAD.

     Try to elide remaining branches:
     CANNOT elide branch /XRebirth/trunk/src/SDKs/bullet
         revisions not movable to parent: 173817,174057,180942,181150

     Branches not mentioned in parent:
     /SDKs/BulletPhysics/tags/2.82
     /SDKs/BulletPhysics/trunk

     Sub-tree merge info cannot be elided due to the following branches:
     /SDKs/BulletPhysics/tags/2.82
     /SDKs/BulletPhysics/trunk
     /XRebirth/trunk/src/SDKs/bullet

here you see that the revisions 173817,174057,180942,181150 are reported
to not be movable to the parent.

The thing here is that all of these revisions are effectively
referencing themselves and therefore should be removable in principle.

The WC is a check-out of
repo
     \proj1
         \branches
             \proj1v1

The proj1v1 branch was created in revision 184223 from trunk - aka from:
repo
     \proj1
         \trunk

so all the revisions (173817,174057,180942,181150) are referring to the
same thing which is implicitly included in the branch (due to its
creation from trunk at r184223). So these should simply be eliminated, no?

Regards,
Stefan
Received on 2015-06-25 17:10:59 CEST

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