Re: To decide whether merge should be done or not
Guten Tag ReshmaBabu, am Freitag, 14. Februar 2014 um 07:27 schrieben Sie: > Whenever there is merge operation being performed by the user, I want to > decide whether the merge should be allowed or not based on certain > conditions. This has been discussed recently: http://subversion.1072662.n5.nabble.com/Pre-step-before-SVN-Merge-td186698.html > I was wondering whether the start-commit hook script can be modified for > this. But, does the merge actually invoke the start-commit script before it > begins the merge operation? No, for good reasons discussed in the link above. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...05151- 9468- 55 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Re: To decide whether merge should be done or not
Hi Arwin, Thanks for your reply. However, when a merge is done, all the conflicts will be resolved and then commit is done. So, the hook scripts are activated during commit process. If I try to block the commit based on certain conditions, the effort & time taken in resolving the conflicts is wasted & the people may get frustrated to see their efforts go in vain. So, I wanted this decision to be taken before the actual merge process starts. Regards, Reshma -- View this message in context: http://subversion.1072662.n5.nabble.com/To-decide-whether-merge-should-be-done-or-not-tp187121p187127.html Sent from the Subversion Users mailing list archive at Nabble.com.
Re: To decide whether merge should be done or not
Guten Tag ReshmaBabu, am Freitag, 14. Februar 2014 um 11:49 schrieben Sie: > If > I try to block the commit based on certain conditions, the effort & time > taken in resolving the conflicts is wasted That depends on your conditions: If your condition is "don't merge on sunday morning" you're right, because you don't need the merge or it's results to check the current time, but in almost every other useful case you need the result of the merge to check for your condition if it is somehow based on code. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...05151- 9468- 55 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Re: To decide whether merge should be done or not
Hi Thorsten, In my case, when I mean merge, it means reintegrating the branch into the trunk mainly. As mentioned in the earlier link provided, even I want the the code quality check to be done before this re-integration occurs. This code quality check can be run through a batch script. So, I want something like, invoking this script first & based on its exit code, it must be decided whether the merging should be started or aborted. In General, *Only a clean code must be allowed to be merged back to the trunk*, not the polluted code(No new Code Violations should be there). Danke schön Guten Tag.. Regards, Reshma -- View this message in context: http://subversion.1072662.n5.nabble.com/To-decide-whether-merge-should-be-done-or-not-tp187121p187131.html Sent from the Subversion Users mailing list archive at Nabble.com.
Re: To decide whether merge should be done or not
Guten Tag ReshmaBabu, am Freitag, 14. Februar 2014 um 12:49 schrieben Sie: > In my case, when I mean merge, it means reintegrating the branch into the > trunk mainly. As mentioned in the earlier link provided, even I want the the > code quality check to be done before this re-integration occurs. Than you have to execute the merge and deal with all maybe occuring conflicts or what codebase do you want to check the quality off? If it's the codebase after the merge you need to run the merge, if it's something other you need to do something else and check that. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...05151- 9468- 55 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Re: To decide whether merge should be done or not
Currently, there are no "client side hook scripts". So, what you are asking cannot be accomplished. Also, what intrigues me is, any checkstyle scripts that you run have to be run on the "merged" code (i.e on the working copy, after the merge, before committing). So by this time, any necessary conflict resolution should have been done. So I don't see why you can't do this check at commit time anyway. If there are any inconsistencies, you can make the hook script return the errors from the checkstyle script, and all the user has to do now is to make the necessary changes and then try committing again. In fact, in my day job, we run these scripts manually before committing, so it saves a round trip to the server. Regards, Arwin Arni
Commit crash with Tortoise SVN 1.8.4
Hi, We have several branches and we run same routines to make the builds. But starting with 1.8.4, on some of the branches we get this error: svn: E235000: In file 'D:\Development\SVN\Releases\TortoiseSVN-1.8.4\ext\subversion\libsvn_client\copy.c' line 1374: assertion failed On some other branches it's working. The batch files and the tools we use to make the build are the same on all branches. Only the application source code is different, of course. What can cause this crash? Tiberius - Nicolae Cocârlea
Access rights files with Parent path and svn protocol?
I've got svnserver running with parent path set and I want to support Path-based Authorization. I'm starting there server as follows: C:\Program Files (x86)\WANdisco\Subversion>svnserve -d -r C:/SVN/repositories I'm having no trouble reading repositories from remote clients with the svn:// protocol but I can't commit. The documentation talks about setting the "authz-db" value in the "svnserve.conf" file to define access rights. However, I'm confused and having some trouble with getting this to work in a parent path environment. If I populate the authz and passwd files in the conf directory of a specific repository and I start the SVNSERVE for that specific repository: (i.e. C:\Program Files (x86)\WANdisco\Subversion>svnserve -d -r C:/SVN/repositories/Test) things seem to work fine. However, if I try to set authz-db to a file in any directory other than the conf directory of the repo. Being served it appears to fail to read it. It works fine if I set authz-db to just the file name in the conf directory like: authz-db = authz it also works fine if I give it a complete path the same file like: authz-db = C:/SVN/repositories/Test/conf/authz However, if I copy the same file to a different directory (i.e. c:/SVN/repositories/authz) then try to reference it either with a relative path or a literal path: authz-db =../../ authz or authz-db = C:/SVN/repositories/authz Finally when I run svnserve with a parent path. no matter what I do in any of the svnserve.conf and authz-db and password-db files anywhere. it just seems to ignore any and all access rights settings.. It just allows read-only access right to anonymous users. never asks for any cridentials, and doesn't allow write rights to anything. I've managed access rights for multiple repositories on other servers where Apache integration was being used to provide HTTP access to the repos but I've never done this before using svnserve.. What am I missing? How do you manage the path-based Authentication for multiple repositories on a single server using svnserve? Thanks in advance, Tom
Re: Access rights files with Parent path and svn protocol?
Guten Tag Tom Malia, am Freitag, 14. Februar 2014 um 22:39 schrieben Sie: > I’m having no trouble reading repositories from remote clients with > the svn:// protocol but I can’t commit. You need to configure anon-access, auth-access and password-db for this to work. > The documentation talks about setting the “authz-db” value in the > “svnserve.conf” file to define access rights. The important distinction is permissions, not authorization. The latter needs to be done using the former mentioned. > authz-db =../../ authz Those paths need a base, this may be the conf directory, but may be some completely different because "authz" alone without a path may be some convention. I don't know which is the base or the conventions existing, but in those cases I always use Process Monitor to check where an application looks for a file. http://technet.microsoft.com/en-us/sysinternals/bb896645.aspx > authz-db = C:/SVN/repositories/authz If that really doesn't work because of some restrictions of SVN, which I doubt, you may simply link your authz files throughout all your repos using symbolic links with mklink. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...05151- 9468- 55 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
RE: Access rights files with Parent path and svn protocol?
Thanks, Actually it seems to be working now I know something changed but I'm not sure what, but I guess I won't argue with success for now. -Original Message- From: Thorsten Schöning [mailto:tschoen...@am-soft.de] Sent: Friday, February 14, 2014 7:02 PM To: users@subversion.apache.org Subject: Re: Access rights files with Parent path and svn protocol? Guten Tag Tom Malia, am Freitag, 14. Februar 2014 um 22:39 schrieben Sie: > Im having no trouble reading repositories from remote clients with > the svn:// protocol but I cant commit. You need to configure anon-access, auth-access and password-db for this to work. > The documentation talks about setting the authz-db value in the > svnserve.conf file to define access rights. The important distinction is permissions, not authorization. The latter needs to be done using the former mentioned. > authz-db =../../ authz Those paths need a base, this may be the conf directory, but may be some completely different because "authz" alone without a path may be some convention. I don't know which is the base or the conventions existing, but in those cases I always use Process Monitor to check where an application looks for a file. http://technet.microsoft.com/en-us/sysinternals/bb896645.aspx > authz-db = C:/SVN/repositories/authz If that really doesn't work because of some restrictions of SVN, which I doubt, you may simply link your authz files throughout all your repos using symbolic links with mklink. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...05151- 9468- 55 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
