Re: To decide whether merge should be done or not

2014-02-14 Thread Thorsten Schöning
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:

Re: To decide whether merge should be done or not

2014-02-14 Thread ReshmaBabu
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

Re: To decide whether merge should be done or not

2014-02-14 Thread Thorsten Schöning
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,

Re: To decide whether merge should be done or not

2014-02-14 Thread ReshmaBabu
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

Re: To decide whether merge should be done or not

2014-02-14 Thread Thorsten Schöning
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.

Re: To decide whether merge should be done or not

2014-02-14 Thread Arwin Arni Nandagopal
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

Commit crash with Tortoise SVN 1.8.4

2014-02-14 Thread Tiberius Nicolae Cocarlea
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 commit_items !=

Access rights files with Parent path and svn protocol?

2014-02-14 Thread Tom Malia
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\Subversionsvnserve -d -r C:/SVN/repositories I'm having no trouble reading repositories from remote clients with the svn://

Re: Access rights files with Parent path and svn protocol?

2014-02-14 Thread Thorsten Schöning
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

RE: Access rights files with Parent path and svn protocol?

2014-02-14 Thread Tom Malia
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: