Branch: refs/heads/master
Home: https://github.com/jenkinsci/svnmerge-plugin
Commit: 83bb949d93d3aece568d923cf4fdec13e1623ffe
https://github.com/jenkinsci/svnmerge-plugin/commit/83bb949d93d3aece568d923cf4fdec13e1623ffe
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2012-04-14 (Sat, 14 Apr 2012)
Changed paths:
M src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
Log Message:
-----------
if integratedRevision==0, no actual integration has happened as it was no-op.
Commit: ccda176a94c374b4415294a17b1cf3d46584d33f
https://github.com/jenkinsci/svnmerge-plugin/commit/ccda176a94c374b4415294a17b1cf3d46584d33f
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2012-04-14 (Sat, 14 Apr 2012)
Changed paths:
M src/main/java/jenkins/plugins/svnmerge/FeatureBranchProperty.java
M src/main/java/jenkins/plugins/svnmerge/IntegrationStatusAction.java
M src/main/java/jenkins/plugins/svnmerge/RebaseAction.java
M src/main/resources/jenkins/plugins/svnmerge/IntegrateAction/badge.groovy
Log Message:
-----------
detect no-op integration more aggressively to catch infinite rebase/integrate
ping-pong
Commit: f7ca8cac02cb70edcde05e550a9ba3d22c29486c
https://github.com/jenkinsci/svnmerge-plugin/commit/f7ca8cac02cb70edcde05e550a9ba3d22c29486c
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2012-04-14 (Sat, 14 Apr 2012)
Changed paths:
M src/main/java/jenkins/plugins/svnmerge/FeatureBranchProperty.java
M src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
Log Message:
-----------
Fixed a test failure. We need to compare against the source of the
integration, not the merge commit.
Commit: ed8ef843dc965e1fc56b7ecd8742f4ddb981483a
https://github.com/jenkinsci/svnmerge-plugin/commit/ed8ef843dc965e1fc56b7ecd8742f4ddb981483a
Author: Kohsuke Kawaguchi <[email protected]>
Date: 2012-04-14 (Sat, 14 Apr 2012)
Changed paths:
M pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release svnmerge-1.2
Compare: https://github.com/jenkinsci/svnmerge-plugin/compare/a3859df...ed8ef84
