Re: To decide whether merge should be done or not

Guten Tag Reshma Babu, am Montag, 17. Februar 2014 um 13:35 schrieben Sie: > I need to check the code quality of the codebase before merge. That's what server side pre commit hooks are for because you can only merge already committed changes and those committed changes should have passed your qua

Re: To decide whether merge should be done or not

Hope u understood. - Thanks & Regards, Reshma -- View this message in context: http://subversion.1072662.n5.nabble.com/To-decide-whether-merge-should-be-done-or-not-tp187121p187184.html Sent from the Subversion Users mailing list archive at Nabble.com.

Re: To decide whether merge should be done or not

invoked. Can this be done? *Just a rough sketch of my requirement:* <http://subversion.1072662.n5.nabble.com/file/n187183/Picture4.jpg> - Thanks & Regards, Reshma -- View this message in context: http://subversion.1072662.n5.nabble.com/To-decide-whether-merge-should-be-done-or-no

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 conf

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.

Re: To decide whether merge should be done or not

chö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 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 righ

Re: To decide whether merge should be done or not

s 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-don

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.

Re: To decide whether merge should be done or not

n? Can anyone help me on this to understand the > merge operation & do necessary changes? > > Thanks in advance. > > Regards, > Reshma > > > > -- > View this message in context: > http://subversion.1072662.n5.nabble.com/To-decide-whether-merge-should-be-do

To decide whether merge should be done or not

script before it begins the merge operation? Can anyone help me on this to understand the merge operation & do necessary changes? Thanks in advance. Regards, Reshma -- View this message in context: http://subversion.1072662.n5.nabble.com/To-decide-whether-merge-should-be-done-or-not-tp187121.