[JIRA] [svnmerge] (JENKINS-23371) Manually-triggered integration

2014-07-16 Thread scm_issue_l...@java.net (JIRA)















































SCM/JIRA link daemon
 resolved  JENKINS-23371 as Fixed


Manually-triggered integration
















Change By:


SCM/JIRA link daemon
(15/Jul/14 12:40 PM)




Status:


Reopened
Resolved





Resolution:


Fixed



























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] (JENKINS-23371) Manually-triggered integration

2014-07-16 Thread scm_issue_l...@java.net (JIRA)














































SCM/JIRA link daemon
 commented on  JENKINS-23371


Manually-triggered integration















Code changed in jenkins
User: Hugues Chabot
Path:
 src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
http://jenkins-ci.org/commit/svnmerge-plugin/990dc84985b54b93eb19b1e62048e1c1f3f04402
Log:
  Merge pull request #14 from hugueschabot/jenkins-23371

FIXED JENKINS-23371 Ignore svn:externals when reintegrating branch


Compare: https://github.com/jenkinsci/svnmerge-plugin/compare/5880b5ac0018...990dc84985b5




























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] (JENKINS-23371) Manually-triggered integration

2014-06-25 Thread hugues.cha...@gmail.com (JIRA)














































Hugues Chabot
 commented on  JENKINS-23371


Manually-triggered integration















It makes sense to ignore the content of external SVN repositories for rebase/integrate 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] (JENKINS-23371) Manually-triggered integration

2014-06-23 Thread chris.pla...@gmail.com (JIRA)














































Chris Platts
 commented on  JENKINS-23371


Manually-triggered integration















Thanks for the reply,

Both the parent and the branch projects have only one SVN module defined, however they do both use SVN Externals to pull in other libraries from our SVN repository.  These externals are not modified in the projects into which they're pulled, so they should be clean (for us, modifying an external from anywhere other than a separate check-out of the external itself is a smack-able offence ) 




























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] (JENKINS-23371) Manually-triggered integration

2014-06-22 Thread hugues.cha...@gmail.com (JIRA)














































Hugues Chabot
 commented on  JENKINS-23371


Manually-triggered integration















The Integrate Branch action will be available if (and only if) the build if from a Feature Branch project that has only one Subversion module.

Can you check if the builds that are not re-integrable have more than one Subversion URLs?



























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] (JENKINS-23371) Manually-triggered integration

2014-06-20 Thread chris.pla...@gmail.com (JIRA)














































Chris Platts
 reopened  JENKINS-23371


Manually-triggered integration
















Reopening because the option to reintegrate isn't showing on a project and can't tell why





Change By:


Chris Platts
(20/Jun/14 11:50 AM)




Resolution:


NotADefect





Status:


Resolved
Reopened



























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] (JENKINS-23371) Manually-triggered integration

2014-06-09 Thread chris.pla...@gmail.com (JIRA)














































Chris Platts
 created  JENKINS-23371


Manually-triggered integration















Issue Type:


New Feature



Affects Versions:


current



Assignee:


Kohsuke Kawaguchi



Components:


svnmerge



Created:


09/Jun/14 9:56 AM



Description:


Hi,

Perhaps this is already available, but I just can't find it!

Is there a way to trigger a manual reintegration of a branch job to its parent?

I understand that there's the post-build action that can be added to do this automatically after each build of the branch, but I'd prefer to only reintegrate once we've decided to do so.

I tried reintegrating the branch as normal via my SVN client, thinking that perhaps the plugin would magically pick that up, but no joy.





Project:


Jenkins



Priority:


Minor



Reporter:


Chris Platts

























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] (JENKINS-23371) Manually-triggered integration

2014-06-09 Thread hugues.cha...@gmail.com (JIRA)















































Hugues Chabot
 resolved  JENKINS-23371 as Not A Defect


Manually-triggered integration
















The manual reintegration action is at the level of the build (not the project).

In your project, select a build and then "Integrate branch".





Change By:


Hugues Chabot
(09/Jun/14 5:12 PM)




Status:


Open
Resolved





Assignee:


KohsukeKawaguchi
HuguesChabot





Resolution:


NotADefect



























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.