Branch: refs/heads/master
Home: https://github.com/jenkinsci/svnmerge-plugin
Commit: 4016d8189a4d9358a968b081be6c55b4493e90b9
https://github.com/jenkinsci/svnmerge-plugin/commit/4016d8189a4d9358a968b081be6c55b4493e90b9
Author: Nicolas De Loof <[email protected]>
Date: 2014-10-31 (Fri, 31 Oct 2014)
Changed paths:
M pom.xml
M src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
Log Message:
-----------
pick up the built revision to merge upstream
Commit: 24297e16b4d208a76d8b5c47cfd905b2b20ede72
https://github.com/jenkinsci/svnmerge-plugin/commit/24297e16b4d208a76d8b5c47cfd905b2b20ede72
Author: Nicolas De Loof <[email protected]>
Date: 2014-11-05 (Wed, 05 Nov 2014)
Changed paths:
M src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
Log Message:
-----------
expand module location
Commit: a492cb131f04957a99c3ee1fc843914733ba9d77
https://github.com/jenkinsci/svnmerge-plugin/commit/a492cb131f04957a99c3ee1fc843914733ba9d77
Author: Hugues Chabot <[email protected]>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M pom.xml
M src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
Log Message:
-----------
Move code to retrieve revision number to getSvnInfo()
Commit: 83a538788c314af80481ed258bf405717f02e4fa
https://github.com/jenkinsci/svnmerge-plugin/commit/83a538788c314af80481ed258bf405717f02e4fa
Author: Hugues Chabot <[email protected]>
Date: 2015-01-02 (Fri, 02 Jan 2015)
Changed paths:
M .gitignore
M pom.xml
M src/main/java/jenkins/plugins/svnmerge/AbstractSvnmergeTaskAction.java
M src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
M src/main/java/jenkins/plugins/svnmerge/IntegrationPublisher.java
M src/main/java/jenkins/plugins/svnmerge/RebaseAction.java
M src/main/java/jenkins/plugins/svnmerge/RebaseBuilder.java
M src/main/java/jenkins/plugins/svnmerge/Utility.java
M src/main/resources/jenkins/plugins/svnmerge/Messages.properties
Log Message:
-----------
Merge branch 'master' into ndeloof-master
Commit: 9c75ae21c8c8bc84affb8de88208cec801b40ae0
https://github.com/jenkinsci/svnmerge-plugin/commit/9c75ae21c8c8bc84affb8de88208cec801b40ae0
Author: Hugues Chabot <[email protected]>
Date: 2015-01-02 (Fri, 02 Jan 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Update to subversion-plugin 2.5
Commit: e33bc18dfa95107686fa99464ccc0c4f02e0827d
https://github.com/jenkinsci/svnmerge-plugin/commit/e33bc18dfa95107686fa99464ccc0c4f02e0827d
Author: Hugues Chabot <[email protected]>
Date: 2015-01-09 (Fri, 09 Jan 2015)
Changed paths:
M pom.xml
M src/main/java/jenkins/plugins/svnmerge/IntegratableProjectAction.java
Log Message:
-----------
Merge branch 'master' into ndeloof-master
Commit: 8eddd8faa48960f0d46364e6dc15317aafbc1098
https://github.com/jenkinsci/svnmerge-plugin/commit/8eddd8faa48960f0d46364e6dc15317aafbc1098
Author: Hugues Chabot <[email protected]>
Date: 2015-01-09 (Fri, 09 Jan 2015)
Changed paths:
M src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
Log Message:
-----------
Do integration on the first module regardless of the number of modules
defined and the "Ignore externals" option (see [JENKINS-26280])
Commit: 2983d4bbfd9dd135197d7c7cf86cd6dc1da80183
https://github.com/jenkinsci/svnmerge-plugin/commit/2983d4bbfd9dd135197d7c7cf86cd6dc1da80183
Author: Hugues Chabot <[email protected]>
Date: 2015-01-09 (Fri, 09 Jan 2015)
Changed paths:
M src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
Log Message:
-----------
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
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
