SVN query for auto merging!!!

Spread the Knowledge

vijayakumar.cm created the topic: SVN query for auto merging!!!
I need a solution for this auto merging strategy in SVN.

My directory structure:
Two branches:
/main_branch/sourcecodefiles
/build_branch à copy of a main branch

è Development happens only in main branch
è no one will commit in build_branch

My Requirement is: Whenever commit happens in main_branch , it should automatically merge the changes in to build branch (i.e it has to merge the changes and commit a new version of it)

There is no need for reverse merging since no changes will get committed in build branch, also it reduces the risk of merge conflicts.

Please let me know if anyone already has solution for this.

Regards,
Vijay

rajeshkumar replied the topic: Re:SVN query for auto merging!!!
SVN is not much smart enough in case of conflict.

if conflict arises you will have to do manually.

Refer more for
svnbook.red-bean.com/en/1.0/re16.html
Regards,
Rajesh Kumar
Twitt me @ twitter.com/RajeshKumarIn

mnanjala replied the topic: Re: SVN query for auto merging!!!
svnmerge.py will do it but you should write a shell script it will call that svnmerge.py tool once check in happened u can call this script by continuous integration server like Hudson

rajeshkumar replied the topic: Re: SVN query for auto merging!!!
Hi Praveen,

Can you please share the soruce link of svnmerge.py and implementation details.

Thanks in Advance?
Regards,
Rajesh Kumar
Twitt me @ twitter.com/RajeshKumarIn

mnanjala replied the topic: Re: SVN query for auto merging!!!
www.orcaware.com/svn/wiki/Svnmerge.py