[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-09 Thread scm_issue_l...@java.net (JIRA)














































SCM/JIRA link daemon
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















Code changed in jenkins
User: Hugues Chabot
Path:
 src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
http://jenkins-ci.org/commit/svnmerge-plugin/2983d4bbfd9dd135197d7c7cf86cd6dc1da80183
Log:
  Do integration on the first module and use SVNRevisionState to retrieve the correct revision of the build.
Fixed JENKINS-26280 Do integration regardless of the "Ignore externals" option.


Compare: https://github.com/jenkinsci/svnmerge-plugin/compare/a5c00fdd471e...2983d4bbfd9d




























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-09 Thread scm_issue_l...@java.net (JIRA)














































SCM/JIRA link daemon
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















Code changed in jenkins
User: Hugues Chabot
Path:
 src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
http://jenkins-ci.org/commit/svnmerge-plugin/8eddd8faa48960f0d46364e6dc15317aafbc1098
Log:
  Do integration on the first module regardless of the number of modules defined and the "Ignore externals" option (see JENKINS-26280)


Compare: https://github.com/jenkinsci/svnmerge-plugin/compare/a492cb131f04...8eddd8faa489




























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread hugues.cha...@gmail.com (JIRA)














































Hugues Chabot
 updated  JENKINS-26280


Missing Integrate Branch from feature branch builds
















Unchecking "Ignore externals" option should re-enable "Integrate action".





Change By:


Hugues Chabot
(09/Jan/15 2:24 AM)




Attachment:


jenkins-26280.png



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread cheung.jac...@gmail.com (JIRA)














































Jackey Cheung
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















Yes, it works now. Thanks  look forward for updates.

As a reference, I've done:

1. downgrade Subversion plugin to 2.4.5;
2. unchecked "Ignore externals" in master job's configure  "Source Code Management";
3. unchecked "Ignore externals" in feature branch job's configure  "Source Code Management".

The "Integrate Branch" is now available from feature branches build page.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread hugues.cha...@gmail.com (JIRA)














































Hugues Chabot
 started work on  JENKINS-26280


Missing Integrate Branch from feature branch builds
















Change By:


Hugues Chabot
(09/Jan/15 2:11 AM)




Status:


Open
InProgress



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread hugues.cha...@gmail.com (JIRA)















































Hugues Chabot
 assigned  JENKINS-26280 to Hugues Chabot



Missing Integrate Branch from feature branch builds
















Change By:


Hugues Chabot
(09/Jan/15 2:10 AM)




Assignee:


KohsukeKawaguchi
HuguesChabot



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread hugues.cha...@gmail.com (JIRA)












































 
Hugues Chabot
 edited a comment on  JENKINS-26280


Missing Integrate Branch from feature branch builds
















Integration won't work if if the SVN module "Ignore externals" option is checked. So, unless it is required to ignore svn:external, uncheking the option should re-enable Integration action.





























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread ghansen...@gmail.com (JIRA)












































 
Greg Hansen
 edited a comment on  JENKINS-26280


Missing Integrate Branch from feature branch builds
















(deleted my comment, made it a separate issue instead, sorry for the spam)



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread ghansen...@gmail.com (JIRA)














































Greg Hansen
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















svnmerge plugin 2.4, jenkins 1.595, matrix-based access control (with additional boxes checked), single module.
At the build step "Rebase with upstream Subversion revision" set to "Latest revision", I get the error:

13:24:06 EnvInject - Executing scripts and injecting environment variables after the SCM step.
13:24:06 EnvInject - Injecting as environment variables the properties content 
13:24:06 GIGA_MODEL=hdccv1
13:24:06 GIGA_TARGET=debug
13:24:06 GIGA_OPTIONS=None
13:24:06 GIGA_CODE=hdccv1
13:24:06 GIGA_BUILD_CODE=GVHD
13:24:06 GIGA_PRODUCT_DIR=gvhd
13:24:06 GIGA_SMART=
13:24:06 
13:24:06 EnvInject - Variables injected successfully.
13:24:06 FATAL: hudson.scm.SubversionSCM.createAuthenticationProvider(Lhudson/model/AbstractProject;Lhudson/scm/SubversionSCM$ModuleLocation;)Lorg/tmatesoft/svn/core/auth/ISVNAuthenticationProvider;
13:24:06 java.lang.NoSuchMethodError: hudson.scm.SubversionSCM.createAuthenticationProvider(Lhudson/model/AbstractProject;Lhudson/scm/SubversionSCM$ModuleLocation;)Lorg/tmatesoft/svn/core/auth/ISVNAuthenticationProvider;
13:24:06 	at jenkins.plugins.svnmerge.FeatureBranchProperty.rebase(FeatureBranchProperty.java:162)
13:24:06 	at jenkins.plugins.svnmerge.RebaseAction.perform(RebaseAction.java:115)
13:24:06 	at jenkins.plugins.svnmerge.RebaseBuilder.perform(RebaseBuilder.java:50)
13:24:06 	at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20)
13:24:06 	at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:770)
13:24:06 	at hudson.model.Build$BuildExecution.build(Build.java:199)
13:24:06 	at hudson.model.Build$BuildExecution.doRun(Build.java:160)
13:24:06 	at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:533)
13:24:06 	at hudson.model.Run.execute(Run.java:1759)
13:24:06 	at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
13:24:06 	at hudson.model.ResourceController.execute(ResourceController.java:89)
13:24:06 	at hudson.model.Executor.run(Executor.java:240)

I'm not sure what this error is telling me. The original sync from the feature branch worked flawlessly. It would appear that it's trying to do some new authentication for the merge, but it's not clear why it's not getting credentials to use. Wouldn't it just be using the credentials from the feature branch sync?



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread hugues.cha...@gmail.com (JIRA)














































Hugues Chabot
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















Greg Hansen This is a compatibility issue with subversion-plugin 2.5. Please downgrade to subversion plugin 2.4 if you can.

This is not related to the current issue. But it is a major issue I will fix in the next days.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread ghansen...@gmail.com (JIRA)












































 
Greg Hansen
 edited a comment on  JENKINS-26280


Missing Integrate Branch from feature branch builds
















I am running 2.4. See JENKINS-26347



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread ghansen...@gmail.com (JIRA)














































Greg Hansen
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















I am running 2.4



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread stefan...@mmbsoftware.it (JIRA)














































Stefano Ciccarelli
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















We have the same problem, we had to revert to previous plugin version.
We have multiple projects in the same SVN.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread cheung.jac...@gmail.com (JIRA)














































Jackey Cheung
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















Yes, I'm using matrix-based access control. The user I've logged in has been granted all accesses,
all check boxes are checked, including integrate and rebase.
However, the Anonymous user has only been granted read permissions on some specific access.

That's all, I've just created one account, which has full access to anything I see in the matrix.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread hugues.cha...@gmail.com (JIRA)














































Hugues Chabot
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















In svnmerge-2.3, the Reintegrate Action always ignored the revision. Launching "Reintegrate" on a build actually reintegrate the HEAD revision of the feature branch instead of the revision of the build.

If this is the behaviour you expected, downgrading to svnmerge could be a workaround.

I am still looking to reproduce the issue on my environment.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-08 Thread hugues.cha...@gmail.com (JIRA)












































 
Hugues Chabot
 edited a comment on  JENKINS-26280


Missing Integrate Branch from feature branch builds
















In svnmerge-2.3, the Reintegrate Action always ignored the revision. Launching "Reintegrate" on a build actually reintegrate the HEAD revision of the feature branch instead of the revision of the build.

If this is the behaviour you expected, downgrading to svnmerge-2.3 could be a workaround.

I am still looking to reproduce the issue on my environment.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-07 Thread hugues.cha...@gmail.com (JIRA)














































Hugues Chabot
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















No, I am not concerned about svn:externals this time.

Jenkins Subversion plugin allows to configure more than one modules. This can be checked in the configuration page, under Source Code Management section.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-07 Thread cheung.jac...@gmail.com (JIRA)














































Jackey Cheung
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















Here's the scm config:

Master Job:
Repository URL:  https://192.168.3.15/svn//trunk
Credentials: 
Local module directory:  .(it's a single dot)
Repository depth:infinity
Ignore externals:checked
Check-out Strategy:  Use 'svn update' as much as possible, with 'svn revert' before update
Repository browser:  Auto

Feature Branch Job:
Repository URL:  https://192.168.3.15/svn//branches/dev1
Credentials: 
Local module directory:  .(it's a single dot)
Repository depth:infinity
Ignore externals:checked
Check-out Strategy:  Use 'svn update' as much as possible, with 'svn revert' before update
Repository browser:  Auto

That's all, nothing else is set, no module, no additional credential.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-07 Thread hugues.cha...@gmail.com (JIRA)














































Hugues Chabot
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















This kind of project should be very well supported by the plugin.

Are you using matrix-based access control by any changes ? New permission for Rebase and Integrate where added in the last release.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-07 Thread hugues.cha...@gmail.com (JIRA)












































 
Hugues Chabot
 edited a comment on  JENKINS-26280


Missing Integrate Branch from feature branch builds
















This kind of project should be very well supported by the plugin.

Are you using matrix-based access control by any chances ? New permission for Rebase and Integrate were added in the last release.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-06 Thread cheung.jac...@gmail.com (JIRA)














































Jackey Cheung
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















There is only one branch.

History:
I've created a dev (not dev1) branch back then, and couldn't see the Integrate button. So I've deleted it, and do it again, created the dev1 branch.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-06 Thread hugues.cha...@gmail.com (JIRA)














































Hugues Chabot
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















I did some investigation and I found that Integration Action does not work if the feature branch job has more that one Subversion modules.

If the job that builds your feature branch has more than one module. Then it is the cause of this issue. I just wanted to confirm that.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-06 Thread cheung.jac...@gmail.com (JIRA)














































Jackey Cheung
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















Not sure if I get it right, are you concerning about svn:externals?

If it's the repo itself, I've just created a fresh repo, make some directories in it (src, build, etc.), and put them all to trunk. Then I created the feature branch from within the Jenkins plugin.



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-06 Thread cheung.jac...@gmail.com (JIRA)












































 
Jackey Cheung
 edited a comment on  JENKINS-26280


Missing Integrate Branch from feature branch builds
















Not sure if I get it right, are you concerning about svn:externals?

If it's the repo itself, I've just created a fresh repo, make some directories in it (src, build, etc.), and put them all to trunk. Then I created the feature branch from within the Jenkins plugin.

Inside "Feature Branches" of the master job, I see this: "Detected repository layout: single project layout".



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-04 Thread cheung.jac...@gmail.com (JIRA)














































Jackey Cheung
 created  JENKINS-26280


Missing Integrate Branch from feature branch builds















Issue Type:


Bug



Assignee:


Kohsuke Kawaguchi



Components:


svnmerge-plugin



Created:


04/Jan/15 8:44 AM



Description:


There is no "Integrate Branch" action in any of feature branches' builds. The following are from `svn info`:

dev1:
Path: .
Working Copy Root Path: /var/lib/jenkins/jobs/-dev1/workspace
URL: https://192.168.3.15/svn//branches/dev1
Repository Root: https://192.168.3.15/svn/
Repository UUID: d0eb5361-05ce-7c4b-8453-cbb3c9b96fe4
Revision: 131
Node Kind: directory
Schedule: normal

trunk:
Path: .
Working Copy Root Path: /var/lib/jenkins/jobs//workspace
URL: https://192.168.3.15/svn//trunk
Repository Root: https://192.168.3.15/svn/
Repository UUID: d0eb5361-05ce-7c4b-8453-cbb3c9b96fe4
Revision: 129
Node Kind: directory
Schedule: normal

What I've done was create a Jenkins job for the trunk. Then create a the dev1
branch in Feature Branches. Then make a change to the README.md, perform a build,
all on dev1. Then go to last build. Yet can't see the Integrate Branch action.


Not sure if it's related, I've tried adding the Integrate to upstream upon successful build post-build action,
and got an exception at the end of a (successful) build:

ERROR: Publisher jenkins.plugins.svnmerge.IntegrationPublisher aborted due to exception
java.lang.NullPointerException
at jenkins.plugins.svnmerge.IntegrateAction.perform(IntegrateAction.java:183)
at jenkins.plugins.svnmerge.IntegrateAction.perform(IntegrateAction.java:172)
at jenkins.plugins.svnmerge.IntegrationPublisher.perform(IntegrationPublisher.java:51)
at hudson.tasks.BuildStepMonitor$2.perform(BuildStepMonitor.java:32)
at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:770)
at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:734)
at hudson.model.Build$BuildExecution.post2(Build.java:183)
at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:683)
at hudson.model.Run.execute(Run.java:1784)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
at hudson.model.ResourceController.execute(ResourceController.java:89)
at hudson.model.Executor.run(Executor.java:240)



I've double checked the Upstream project name is correct. Also, the branch job is created with "Feature Branch".

In the "Configure" of branch job:
"This project builds a Subversion feature branch" is checked;
"Upstream project name" is "".

In the Status page of branch job:
"Subversion Merge Tracking
This project is a feature branch of "

Clicking the job link goes to the master job "", as expected.

In the "Configure" of master job:
"Accept Integration from Subversion feature branches" is checked.

In the "Feature Branches" of master job:
"Existing Feature Branches
-dev1"

Clicking the job name goes to the branch job, as expected.



The svn repo is a fresh one, just for trying out the Jenkins. There is no other sources in it.

I've double checked with:
svn propget svn:externals
Which returns empty.




Environment:


CentOS 6, Jenkins 1.595, svnmerge plugin 2.4, Java 1.7.0_71




Project:


Jenkins



Labels:


plugin




Priority:


Major



Reporter:


Jackey Cheung

























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-04 Thread hugues.cha...@gmail.com (JIRA)














































Hugues Chabot
 commented on  JENKINS-26280


Missing Integrate Branch from feature branch builds















Is it possible that the job has more than one Subversion modules ?



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[JIRA] [svnmerge-plugin] (JENKINS-26280) Missing Integrate Branch from feature branch builds

2015-01-04 Thread hugues.cha...@gmail.com (JIRA)












































 
Hugues Chabot
 edited a comment on  JENKINS-26280


Missing Integrate Branch from feature branch builds
















How many Subversion modules does the feature branch have ?



























This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira







-- 
You received this message because you are subscribed to the Google Groups Jenkins Issues group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.