To decide whether merge should be done or not

2014-02-13 Thread ReshmaBabu
Hi Team, 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. I was wondering whether the start-commit hook script can be modified for this. But, does the merge actually invoke the start-commit scri

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 was

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 wan