You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by sNop <sn...@seznam.cz> on 2010/07/01 18:11:55 UTC
Big problem with svn:mergeinfo, feature branches and merging (reintegrate)
Hi,
I have big problems with _reintegrating feature branches_. I have this problem only with *_one reposity location_*.
_I show it on example_:
1) I create branch ( _feature branch_ )
2) I switch to this branch
3) *_I change/edit only one file in this feature branch!_* and commit ( the filename which i change is *_assets\CrystalShop\Crystal\Shop\Abstract.php_* )
3) I switch back to trunk and try reintegrate this feature branch back to trunk
4) the result looks like this ( I show it with the help of the TortoiseSVN ):
I decided, that I create video where is everything showed, so here is the link to the captured screen, it's online on Vimeo server ( you can watch it in web browser ):
http://vimeo.com/12973409
I must solve this problem somehow and I want to know 3 things:
- not what cause this problem, because I know that *svn:mergeinfo* properties on the _subdirectories_ and on the _files in the subdirectories_ cause this, BUT WHY IT'S SO?
- how to prevent this problem?
- and how can I resolve this problem ( I don't want to delete *svn:mergeinfo*, but as I can see *_it's only one possible solution_* :(, or i'm wrong?? )
When someone decide to help me or know how to resolve this problem, but need some more info about the properties in my repository ( or anything else related to the SVN repository ), I can create user for this repository ( can provide read access ),
because I have my own public IP address.
Thanks for any advices and suggestions, because the issue priority it's very critical and blocker for our company.
Re: Big problem with svn:mergeinfo, feature branches and merging
(reintegrate)
Posted by sNop <sn...@seznam.cz>.
Hi Bob,
first I want to thank you for you reaction.
On 1. 7. 2010 20:33, Bob Archer wrote:
>> Hi,
>>
>> I have big problems with reintegrating feature branches. I have
>> this problem only with one reposity location.
>>
>> I show it on example:
>> 1) I create branch ( feature branch )
>> 2) I switch to this branch
>> 3) I change/edit only one file in this feature branch! and commit (
>> the filename which i change is
>> assets\CrystalShop\Crystal\Shop\Abstract.php )
>> 3) I switch back to trunk and try reintegrate this feature branch
>> back to trunk
>> 4) the result looks like this ( I show it with the help of the
>> TortoiseSVN ):
>> I decided, that I create video where is everything showed, so here
>> is the link to the captured screen, it's online on Vimeo server (
>> you can watch it in web browser ):
>> http://vimeo.com/12973409
>>
>> I must solve this problem somehow and I want to know 3 things:
>> - not what cause this problem, because I know that svn:mergeinfo
>> properties on the subdirectories and on the files in the
>> subdirectories cause this, BUT WHY IT'S SO?
> Because you did a merge at a level other than the root folder level. svn will update merge info on any folder or file that already has mergeinfo on it even if there is no change to that file/folder. The info will be elided (removed) if the mergeinfo of the child matches the merge info of the parent.
And how can I achieve this.
> You can google for mergeinfo elision to find out more about this.
I try to google more info about this.
>> - how to prevent this problem?
> Only merge to the root folder of the project. If you merge a sub-folder or single file you are going to get merge info on that file.
I thought it is so.
> If you only want to merge changes to a single file you should cherrypick the revisions that contains the changes you want rather than merging a sub-folder or file.
This is very useful info for me, thank you
>> - and how can I resolve this problem ( I don't want to delete
>> svn:mergeinfo, but as I can see it's only one possible solution :(,
>> or i'm wrong?? )
> As long as you are sure that the merge info in the /trunk folder is valid for ALL the child folders and objects then yes, you can delete it on the child objects.
And how can I determine, that the merge info is valid for all the child folders?
Or when I did the reintegrate on the subdirs, so merge info was updated on the /trunk folder too? ( If so, then the merge info in the /trunk folder is valid for ALL the child folders, but i don't know if it's so ).
> Thankfully in 1.7 this problem will go away because mergeinfo will only be placed/updated on files that have changes in them. But, we are probably 6-12 months away from that release. (from what I read on the dev list)
This are good news.
> BOb
I am much grateful for your helpful advices.
Re: Big problem with svn:mergeinfo, feature branches and merging
(reintegrate)
Posted by sNop <sn...@seznam.cz>.
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.
Re: Big problem with svn:mergeinfo, feature branches and merging
(reintegrate)
Posted by sNop <sn...@seznam.cz>.
Hi Bob,
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.
>
I understand.
> So, I would verify that all the merge info on /trunk is in place.
>
I will do it.
>
>
> 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.
>
This are great new for me. ;)
80% of branches was deleted after reintegrating and I have created 3 branches now. 2 branches are created correctly ( from /trunk folder ) and 1 branch is created from subdir.
>
>
> 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. 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.
>
Great, Great, this is exactly what I need, many thanks Bob. I try it as soon as possible and post result of this operation.
>
>
> 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
>
>
>
>
>
> *From:* sNop [mailto:snop3@seznam.cz]
> *Sent:* Thursday, July 01, 2010 3:47 PM
> *To:* Bob Archer
> *Subject:* Re: Big problem with svn:mergeinfo, feature branches and merging (reintegrate)
>
>
>
> Hi Bob,
>
> first I want to thank you for you reaction.
>
> On 1. 7. 2010 20:33, Bob Archer wrote:
>
> Hi,
>
>
>
> I have big problems with reintegrating feature branches. I have
>
> this problem only with one reposity location.
>
>
>
> I show it on example:
>
> 1) I create branch ( feature branch )
>
> 2) I switch to this branch
>
> 3) I change/edit only one file in this feature branch! and commit (
>
> the filename which i change is
>
> assets\CrystalShop\Crystal\Shop\Abstract.php )
>
> 3) I switch back to trunk and try reintegrate this feature branch
>
> back to trunk
>
> 4) the result looks like this ( I show it with the help of the
>
> TortoiseSVN ):
>
> I decided, that I create video where is everything showed, so here
>
> is the link to the captured screen, it's online on Vimeo server (
>
> you can watch it in web browser ):
>
> http://vimeo.com/12973409
>
>
>
> I must solve this problem somehow and I want to know 3 things:
>
> - not what cause this problem, because I know that svn:mergeinfo
>
> properties on the subdirectories and on the files in the
>
> subdirectories cause this, BUT WHY IT'S SO?
>
>
> Because you did a merge at a level other than the root folder level. svn will update merge info on any folder or file that already has mergeinfo on it even if there is no change to that file/folder. The info will be elided (removed) if the mergeinfo of the child matches the merge info of the parent.
>
>
> And how can I achieve this.
>
>
> You can google for mergeinfo elision to find out more about this.
>
>
> I try to google more info about this.
>
>
> - how to prevent this problem?
>
>
> Only merge to the root folder of the project. If you merge a sub-folder or single file you are going to get merge info on that file.
>
>
> I thought it is so.
>
>
> If you only want to merge changes to a single file you should cherrypick the revisions that contains the changes you want rather than merging a sub-folder or file.
>
>
> This is very useful info for me, thank you
>
>
>
>
> - and how can I resolve this problem ( I don't want to delete
>
> svn:mergeinfo, but as I can see it's only one possible solution :(,
>
> or i'm wrong?? )
>
>
> As long as you are sure that the merge info in the /trunk folder is valid for ALL the child folders and objects then yes, you can delete it on the child objects.
>
>
> And how can I determine, that the merge info is valid for all the child folders?
> Or when I did the reintegrate on the subdirs, so merge info was updated on the /trunk folder too? ( If so, then the merge info in the /trunk folder is valid for ALL the child folders, but i don't know if it's so ).
>
>
>
> Thankfully in 1.7 this problem will go away because mergeinfo will only be placed/updated on files that have changes in them. But, we are probably 6-12 months away from that release. (from what I read on the dev list)
>
>
> This are good news.
>
>
> BOb
>
>
> I am much grateful for your helpful advices.
>
RE: Big problem with svn:mergeinfo, feature branches and merging
(reintegrate)
Posted by Bob Archer <Bo...@amsi.com>.
> Hi,
>
> I have big problems with reintegrating feature branches. I have
> this problem only with one reposity location.
>
> I show it on example:
> 1) I create branch ( feature branch )
> 2) I switch to this branch
> 3) I change/edit only one file in this feature branch! and commit (
> the filename which i change is
> assets\CrystalShop\Crystal\Shop\Abstract.php )
> 3) I switch back to trunk and try reintegrate this feature branch
> back to trunk
> 4) the result looks like this ( I show it with the help of the
> TortoiseSVN ):
> I decided, that I create video where is everything showed, so here
> is the link to the captured screen, it's online on Vimeo server (
> you can watch it in web browser ):
> http://vimeo.com/12973409
>
> I must solve this problem somehow and I want to know 3 things:
> - not what cause this problem, because I know that svn:mergeinfo
> properties on the subdirectories and on the files in the
> subdirectories cause this, BUT WHY IT'S SO?
Because you did a merge at a level other than the root folder level. svn will update merge info on any folder or file that already has mergeinfo on it even if there is no change to that file/folder. The info will be elided (removed) if the mergeinfo of the child matches the merge info of the parent. You can google for mergeinfo elision to find out more about this.
> - how to prevent this problem?
Only merge to the root folder of the project. If you merge a sub-folder or single file you are going to get merge info on that file. If you only want to merge changes to a single file you should cherrypick the revisions that contains the changes you want rather than merging a sub-folder or file.
> - and how can I resolve this problem ( I don't want to delete
> svn:mergeinfo, but as I can see it's only one possible solution :(,
> or i'm wrong?? )
As long as you are sure that the merge info in the /trunk folder is valid for ALL the child folders and objects then yes, you can delete it on the child objects.
Thankfully in 1.7 this problem will go away because mergeinfo will only be placed/updated on files that have changes in them. But, we are probably 6-12 months away from that release. (from what I read on the dev list)
BOb
Re: Big problem with svn:mergeinfo, feature branches and merging
(reintegrate)
Posted by sNop <sn...@seznam.cz>.
On 1. 7. 2010 20:41, Andy Levy wrote:
> On Thu, Jul 1, 2010 at 14:11, sNop <sn...@seznam.cz> wrote:
>> Hi,
>>
>> I have big problems with reintegrating feature branches. I have this problem
>> only with one reposity location.
>>
>> I show it on example:
>> 1) I create branch ( feature branch )
>> 2) I switch to this branch
>> 3) I change/edit only one file in this feature branch! and commit ( the
>> filename which i change is assets\CrystalShop\Crystal\Shop\Abstract.php )
>> 3) I switch back to trunk and try reintegrate this feature branch back to
>> trunk
>> 4) the result looks like this ( I show it with the help of the TortoiseSVN
>> ):
>> I decided, that I create video where is everything showed, so here is the
>> link to the captured screen, it's online on Vimeo server ( you can watch it
>> in web browser ):
>> http://vimeo.com/12973409
> A lot of people on this mailing list can't (or don't want to) view
> video. Video is also not searchable. Please describe in words,
> copy/paste any messages you get, etc.
The problem is so complex, that I don't/can't describe it in English language ( my English isn't so good ), so I have decided to create video.
>> Thanks for any advices and suggestions, because the issue priority it's very
>> critical and blocker for our company.
> If support (and timely response) is a critical issue for you, you
> should be paying for dedicated support.
Simply, I am self-employed and moneys are the problem. If I have money, then certainly I will use this support, because my problem would be surely resolve.
Re: Big problem with svn:mergeinfo, feature branches and merging
(reintegrate)
Posted by Andy Levy <an...@gmail.com>.
On Thu, Jul 1, 2010 at 14:11, sNop <sn...@seznam.cz> wrote:
> Hi,
>
> I have big problems with reintegrating feature branches. I have this problem
> only with one reposity location.
>
> I show it on example:
> 1) I create branch ( feature branch )
> 2) I switch to this branch
> 3) I change/edit only one file in this feature branch! and commit ( the
> filename which i change is assets\CrystalShop\Crystal\Shop\Abstract.php )
> 3) I switch back to trunk and try reintegrate this feature branch back to
> trunk
> 4) the result looks like this ( I show it with the help of the TortoiseSVN
> ):
> I decided, that I create video where is everything showed, so here is the
> link to the captured screen, it's online on Vimeo server ( you can watch it
> in web browser ):
> http://vimeo.com/12973409
A lot of people on this mailing list can't (or don't want to) view
video. Video is also not searchable. Please describe in words,
copy/paste any messages you get, etc.
> Thanks for any advices and suggestions, because the issue priority it's very
> critical and blocker for our company.
If support (and timely response) is a critical issue for you, you
should be paying for dedicated support.