svn-merge-reintegrate

Detecting branch reintegration or merge in pre-commit script

冷暖自知 提交于 2019-12-22 03:49:20
问题 Within a pre-commit script, is it possible (and if so, how) to identify commits stemming from an svn merge ? svnlook changed ... shows files that have changed, but does not differentiate between merges and manual edits. Ideally, I would also like to differentiate between a standard merge and a merge --reintegrate . Background: I'm exploring the possibility of using pre-commit hooks to enforce SVN usage policies for our project. One of the policies state that some directories (such as /trunk )

SVN Merge - Completely “theirs full” - Branch to trunk

无人久伴 提交于 2019-12-06 09:03:40
问题 I want to merge my branch to trunk and basically want to over-write all the code in branch to the trunk..While receiving conflicts I kept doing "theirs full" for all the conflict; but still at the end it shows so many conflicts. All I want is over-write complete branch on my trunk. Surely a possible way is to branch out from my branch but then my trunk becomes useless ! Also, while doing svn merge can I give an option so that for all conflicts it takes a particular value ( in this case Full

SVN Merge - Completely “theirs full” - Branch to trunk

心不动则不痛 提交于 2019-12-04 13:10:51
I want to merge my branch to trunk and basically want to over-write all the code in branch to the trunk..While receiving conflicts I kept doing "theirs full" for all the conflict; but still at the end it shows so many conflicts. All I want is over-write complete branch on my trunk. Surely a possible way is to branch out from my branch but then my trunk becomes useless ! Also, while doing svn merge can I give an option so that for all conflicts it takes a particular value ( in this case Full-theirs ) and I dont have to type it always for all the conflicts. Pass --accept=theirs-full to the svn