Re: Tigris binary packages for Windows
Dne 1. 3. 2010 15:09, Olivier Sannier napsal(a): > Bojan Resnik wrote: >> Hi, >> We have a custom server setup and we have been using Tigris.org >> binaries for Windows. The latest version there, however, is 1.6.6. >> Will there be Tigris.org binary packages for Windows for Subversion >> 1.6.9 and later? Or perhaps an equivalent of these packages, with >> full server, client and bindings but without installers? > I would be interested in those as well, please. > > Regards > Olivier > Hi, the same here, I'm lacking this builds too signature.asc Description: OpenPGP digital signature
Re: Managing Vendor Branches
Dne 1. 3. 2010 15:09, Olivier Sannier napsal(a): > There is the svn_load_dirs.pl script but it's not very intuitive to use. > For those who are under Windows, I wrote a wizard based tool that > manages those externals for you. > Its sources (Delphi 2009) are available here: > > http://svnwintools.tigris.org/svn/svnwintools/trunk/sources > > along with a few other tools. > The tool in itself works well, I'm using it in production every time I > have a new vendor drop. > The project's website at tigris is a whole other story as I did not > have time to create it nor to publish precompiled binaries. > Hi Oliver, the tools looks very usable, when you will have some time, you could create binaries and some simple documentation (only what is doing every tool or script) signature.asc Description: OpenPGP digital signature
Re: Tigris binary packages for Windows
Hi Dave, Dne 2. 3. 2010 19:42, David Darj napsal(a): > Then I would gladly take over and build upcoming versions for the > community. > > /David > That would by cool. signature.asc Description: OpenPGP digital signature
Re: Tigris binary packages for Windows
Hi all, > Well, I, for one, would need the Apache 2.2 bindings but I do not need > the Python bindings at all, which I suspect most users don't either. > So basic binaries with 2.2 support would be perfect for starters > The same, only need Apache 2.2 modules and compiled subversion, other binding aren't so important for end user, which are useing subversion for versioning own projects. And without installer! ;) Only copy to the Program Files and go on signature.asc Description: OpenPGP digital signature
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 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 are links to the captured screens, one file is encoded by the xvid codec and second in TechSmith Screen Capture Codec - tscc.dll: http://www.megaupload.com/?d=2DQ0J9IQ http://www.megaupload.com/?d=LMYSA74F I must solve this problem somehow and I want to know 2 thinks: - not what cause this problem, because I know that svn:mergeinfo properties on subdirs and on files in subdirs cause this, BUT WHY IT'S SO - 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?? ) Thanks for any advices and suggestions, because issue priority it's very critical/blocker for me. signature.asc Description: OpenPGP digital signature
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. signature.asc Description: OpenPGP digital signature
Re: Big problem with svn:mergeinfo, feature branches and merging (reintegrate)
On 1. 7. 2010 20:41, Andy Levy wrote: > On Thu, Jul 1, 2010 at 14:11, sNop 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. signature.asc Description: OpenPGP digital signature
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. signature.asc Description: OpenPGP digital signature
Re: Big problem with svn:mergeinfo, feature branches and merging (reintegrate)
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:sn...@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. > signature.asc Description: OpenPGP digital signature
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/LastCheckCo
