Re: Big problem with svn:mergeinfo, feature branches and merging (reintegrate)

 Hi,

On 1. 7. 2010 22:11, Bob Archer wrote:
>
> Basically if you merge changes in a sub-folder that subfolder will get mergeinfo on it. That info won't be on trunk. So, I would verify that all the merge info on /trunk is in place.
>
>
>
> Another think is that if you mostly use feature branches and you have removed them after reintegrating them, you don't really need that merge info any more. I know svn will ignore it, but when you look at the mergeinfo it will be cluttered.
>
>
>
> So, you might want to start by removing all the merge info on folder/files in /trunk that reference branches that you have already integrated and deleted.
>

So I have removed all merge info on subfolder/files in /trunk, because all branches are already deleted. So I got rid of a many useless svn:mergeinfo, so it's great.

> Then check to see if there is any merge info left of the child paths that is no in trunk. If it is not in trunk you need to check to see if those rev's have modifications in that branch that occurred in paths other than the child paths.
>
>
>
> Only you can know if a merge done on one file only contained changes to that file in that rev. If it did that mergeinfo can be promoted up to the /trunk folder.
>
>
>
> Good luck.
>
>
>
> BOb
>
>
>

But there are few confused mergeinfo on trunk.

I describe my situation now. This is the important dir structure of my trunk ( which relate with this issue ):
trunk/
trunk/assets/
trunk/CrystalShop/ ( in the past the name of this folder was snShop/, I have renamed it later to CrystalShop/ )

I have only one branch now, it's "branches/porcelan.sk/", but this branch was created from subfolder "trunk/CrystalShop/" and some revisions from this branch was merged to the trunk.

Here is the output of the command svn pg svn:mergeinfo -vR . ( command was executed against trunk/ ):

[E:\htdocs\Crystal-eShop-MODx]svn pg svn:mergeinfo -vR .
Properties on '.':
  svn:mergeinfo
    /branches/1.0.0:90-152
    /branches/1.1.0:118-147
    /branches/1.1.1:156-162
    /branches/2.0.0:164-315
    /branches/2.1.0:215-312
    /branches/3.0.0:164-569
    /branches/ceny-s-dph:536-556
    /trunk:163
Properties on 'assets\CrystalShop\Crystal\Plugins':
  svn:mergeinfo
    /branches/porcelan.sk/plugins:104-105,107
    /trunk/assets/CrystalShop/Crystal/Plugins:163
    /trunk/assets/snShop/plugins:108-113
Properties on 'assets\CrystalShopConfig\templates\Render':
  svn:mergeinfo
    /branches/porcelan.sk/templates/Render:104-105,107
    /branches/porcelan.sk/templates/snRender:104-105,107
    /trunk/assets/CrystalShopConfig/templates/Render:163
    /trunk/assets/snShop/templates/Render:108-113
    /trunk/assets/snShop/templates/snRender:108-113
Properties on 'assets\CrystalShop\Crystal\Models':
  svn:mergeinfo
    /branches/porcelan.sk/models:104-105,107
    /trunk/assets/CrystalShop/Crystal/Models:163
    /trunk/assets/snShop/models:108-113
Properties on 'assets\CrystalShop\Crystal\Libs':
  svn:mergeinfo
    /branches/porcelan.sk/libs:104-105,107
    /trunk/assets/CrystalShop/Crystal/Libs:163
    /trunk/assets/snShop/libs:108-113
Properties on 'library\FirePHP.php':
  svn:mergeinfo
    /branches/porcelan.sk/libs/FirePHP.class.php:104-105,107
    /trunk/assets/snShop/libs/FirePHP.class.php:108-113
Properties on 'assets\CrystalShop\Crystal\Render\ShowBasketOnProductsPage.php':
  svn:mergeinfo
    /branches/porcelan.sk/snRender/IsProductInStock.php:104-105,107
    /trunk/assets/snShop/snRender/IsProductInStock.php:108-113
Properties on 'assets\CrystalShopConfig\templates\Render\PurchaseForm\layout.tpl.html':
  svn:mergeinfo
    /branches/porcelan.sk/templates/Render/PurchaseForm.tpl.html:104-105,107
    /branches/porcelan.sk/templates/snRender/PurchaseForm.tpl.html:104-105,107
    /trunk/assets/snShop/templates/Render/PurchaseForm.tpl.html:108-113
    /trunk/assets/snShop/templates/snRender/PurchaseForm.tpl.html:108-113
Properties on 'assets\CrystalShop\Crystal\Plugins\InitZendComponents.php':
  svn:mergeinfo
    /branches/porcelan.sk/plugins/RegisterAutoloader.php:104-105,107
    /trunk/assets/snShop/plugins/RegisterAutoloader.php:108-113
Properties on 'assets\CrystalShopConfig\templates\Render\ShoppingBasketPurchase\products.tpl.html':
  svn:mergeinfo
    /branches/porcelan.sk/templates/Render/ShoppingBasketPurchase-products.tpl.html:104-105,107
    /branches/porcelan.sk/templates/snRender/ShoppingBasketPurchase-products.tpl.html:104-105,107
    /trunk/assets/snShop/templates/Render/ShoppingBasketPurchase-products.tpl.html:108-113
    /trunk/assets/snShop/templates/snRender/ShoppingBasketPurchase-products.tpl.html:108-113
Properties on 'assets\CrystalShopConfig\templates\Render\LastCheckControl\layout.tpl.html':
  svn:mergeinfo
    /branches/porcelan.sk/templates/Render/LastCheckControl.tpl.html:104-105,107
    /branches/porcelan.sk/templates/snRender/LastCheckControl.tpl.html:104-105,107
    /trunk/assets/snShop/templates/Render/LastCheckControl.tpl.html:108-113
    /trunk/assets/snShop/templates/snRender/LastCheckControl.tpl.html:108-113
Properties on 'assets\CrystalShopConfig\templates\Render\PurchaseSuccess\layout.tpl.html':
  svn:mergeinfo
    /branches/porcelan.sk/templates/Render/PurchaseSuccess.tpl.html:104-105,107
    /branches/porcelan.sk/templates/snRender/PurchaseSuccess.tpl.html:104-105,107
    /trunk/assets/snShop/templates/Render/PurchaseSuccess.tpl.html:108-113
    /trunk/assets/snShop/templates/snRender/PurchaseSuccess.tpl.html:108-113
Properties on 'assets\CrystalShopConfig\templates':
  svn:mergeinfo
    /branches/porcelan.sk/templates:104-105,107
    /trunk/assets/CrystalShopConfig/templates:163
    /trunk/assets/snShop/templates:108-113
    /trunk/assets/snShop-config/templates:108-113
Properties on 'assets\CrystalShopConfig\templates\Render\RegistrationBoxInSidebar\layout.tpl.html':
  svn:mergeinfo
    /branches/porcelan.sk/templates/Render/RegistrationBoxInSidebar.tpl.html:104-105,107
    /branches/porcelan.sk/templates/snRender/RegistrationBoxInSidebar.tpl.html:104-105,107
    /trunk/assets/snShop/templates/Render/RegistrationBoxInSidebar.tpl.html:108-113
    /trunk/assets/snShop/templates/snRender/RegistrationBoxInSidebar.tpl.html:108-113
Properties on 'assets\CrystalShopConfig':
  svn:mergeinfo
    /trunk/assets/CrystalShopConfig:163
    /trunk/assets/snShop-config:108-113
Properties on 'assets\CrystalShopConfig\CrystalShopConfig.js.blank':
  svn:mergeinfo
    /trunk/assets/CrystalShopConfig/CrystalShopConfig.js.blank:163
    /trunk/assets/snShop-config/snShopConfig.js.blank:108-113
Properties on 'assets\CrystalShopConfig\templates\Render\DualPrice\layout.tpl.html':
  svn:mergeinfo
    /branches/porcelan.sk/templates/Render/DualPrice.tpl.html:104-105,107
    /branches/porcelan.sk/templates/snRender/DualPrice.tpl.html:104-105,107
    /trunk/assets/snShop/templates/Render/DualPrice.tpl.html:108-113
    /trunk/assets/snShop/templates/snRender/DualPrice.tpl.html:108-113
Properties on 'assets\CrystalShop\Crystal\Shop':
  svn:mergeinfo
    /branches/porcelan.sk/Shop:104-105,107
    /trunk/assets/CrystalShop/Crystal/Shop:163
    /trunk/assets/snShop/Shop:108-113
Properties on 'assets\CrystalShop\Crystal\index.html':
  svn:mergeinfo
    /branches/porcelan.sk/index.html:104-105,107
    /trunk/assets/CrystalShop/Crystal/index.html:163
    /trunk/assets/snShop/index.html:108-113
Properties on 'assets\CrystalShopConfig\templates\Render\ShoppingBasketSidebar\layout.tpl.html':
  svn:mergeinfo
    /branches/porcelan.sk/templates/Render/ShoppingBasketSidebar-basketNotEmpty.tpl.html:104-105,107
    /branches/porcelan.sk/templates/snRender/ShoppingBasketSidebar-basketNotEmpty.tpl.html:104-105,107
    /trunk/assets/snShop/templates/Render/ShoppingBasketSidebar-basketNotEmpty.tpl.html:108-113
    /trunk/assets/snShop/templates/snRender/ShoppingBasketSidebar-basketNotEmpty.tpl.html:108-113
Properties on 'assets\CrystalShopConfig\templates\Render\ShoppingBasketPurchase\layout.tpl.html':
  svn:mergeinfo
    /branches/porcelan.sk/templates/Render/ShoppingBasketPurchase.tpl.html:104-105,107
    /branches/porcelan.sk/templates/snRender/ShoppingBasketPurchase.tpl.html:104-105,107
    /trunk/assets/snShop/templates/Render/ShoppingBasketPurchase.tpl.html:108-113
    /trunk/assets/snShop/templates/snRender/ShoppingBasketPurchase.tpl.html:108-113
Properties on 'assets\CrystalShopConfig\templates\Render\PurchaseSuccessButNotSuccessForPurchaser\layout.tpl.html':
  svn:mergeinfo
    /branches/porcelan.sk/templates/Render/PurchaseSuccessButNotSuccessForPurchaser.tpl.html:104-105,107
    /branches/porcelan.sk/templates/snRender/PurchaseSuccessButNotSuccessForPurchaser.tpl.html:104-105,107
    /trunk/assets/snShop/templates/Render/PurchaseSuccessButNotSuccessForPurchaser.tpl.html:108-113
    /trunk/assets/snShop/templates/snRender/PurchaseSuccessButNotSuccessForPurchaser.tpl.html:108-113
Properties on 'assets\CrystalShop\Crystal\getScrollUri.inc.php':
  svn:mergeinfo
    /branches/porcelan.sk/getScrollUri.inc.php:104-105,107
    /trunk/assets/CrystalShop/Crystal/getScrollUri.inc.php:163
    /trunk/assets/snShop/getScrollUri.inc.php:108-113
Properties on 'assets\CrystalShopConfig\templates\Render\TransportAndPaymentMethod\layout.tpl.html':
  svn:mergeinfo
    /branches/porcelan.sk/templates/Render/TransportAndPaymentMethod.tpl.html:104-105,107
    /branches/porcelan.sk/templates/snRender/TransportAndPaymentMethod.tpl.html:104-105,107
    /trunk/assets/snShop/templates/Render/TransportAndPaymentMethod.tpl.html:108-113
    /trunk/assets/snShop/templates/snRender/TransportAndPaymentMethod.tpl.html:108-113
Properties on 'assets\CrystalShop':
  svn:mergeinfo
    /branches/porcelan.sk:104-105,107
    /trunk/assets/CrystalShop:163
    /trunk/assets/snShop:108-113
Properties on 'assets\CrystalShop\Crystal\Render':
  svn:mergeinfo
    /branches/porcelan.sk/snRender:104-105,107
    /trunk/assets/CrystalShop/Crystal/Render:163
    /trunk/assets/snShop/snRender:108-113

1) the branch "branches/porcelan.sk/" will not be never merged to the trunk, so how can I resolve mergeinfo related with this branch ?
2) I would like to have correct tree structure for branch "branches/porcelan.sk/", so the structure looks like this now:
   js/
   libs/
   models/
   ...

   and it should look like this:
   application/
   assets/
         |
         CrystalShop/
                    |
                    js/
                    libs/
                    models/
                    ...
         |
         CrystalShopConfig/
         plugins/
         snippets/
   eshop/
   ...
   I don't know how to resolve this problem too, but it's other problem, but it relate with mergeinfo, so I had to describe this.

3) I don't know why are on the trunk folders/files mergeinfo like "/trunk/assets/CrystalShop/Crystal/Render:163" and how can I remove this mergeinfos.

This are last 3 issues which I have and which I have to resolve.

Thank you very much for advices.