-
Improvement
-
Resolution: Unresolved
-
Major
-
None
We want to make use of svnmerge plugin in Jenkins, especially it's feature of automatic integrations to upstream after succesfull build. We've discovered one issue which prevents us from using the plugin: we don't want the automatic rebase to be executed right after the integration. We realize that it is often convenient, but it would be great if there was a switch allowing to decide whether rebase should be performed during integration to upstream or not.
The code where the rebasing is performed:
https://github.com/jenkinsci/svnmerge-plugin/blob/master/src/main/java/jenkins/plugins/svnmerge/FeatureBranchProperty.java
line 383
This automatic rebase is a necessary operation to keep the feature branch usable after reintegration (see Keeping a Reintegrated Branch Alive).
In order to skip this rebase, the job for the feature branch should be disabled or deleted. Otherwise, the next rebase on the feature branch will likelly generate spurious conflicts.
In my opinion, if you don't want the automatic rebasing after reintegration you don't want to use the feature branch anymore. Am I correct ?