[JIRA] (JENKINS-15701) Integrate branch gives "No changes to be integrated"
Tobias Dittrich
edited a comment on JENKINS-15701
Integrate branch gives "No changes to be integrated"
After looking around in the code I think I found the place where it goes wrong (FeatureBranchProperty.java line 273):
FeatureBranchProperty.java
final SVNException eureka = new SVNException(null);
try {
cm.getLogClient().doLog(new File[]{mr},mergeRev,SVNRevision.create(lastIntegrationSourceRevision),mergeRev,true,false,-1,new ISVNLogEntryHandler() {
public void handleLogEntry(SVNLogEntry e) throws SVNException {
if (e.getMessage().startsWith(RebaseAction.COMMIT_MESSAGE_PREFIX)
|| e.getMessage().startsWith(IntegrateAction.COMMIT_MESSAGE_PREFIX))
return; // merge commits
throw eureka;
}
});
// didn't find anything interesting. all the changes are our merges
logger.println("No changes to be integrated. Skipping integration.");
return new IntegrationResult(0,mergeRev);
} catch (SVNException e) {
if (e!=eureka)
throw e; // some other problems
// found some changes, keep on integrating
}
It seems like eureka is handled gracefully in the parsing process and so the catch block is never reached.
I'm not 100 percent sure, though, because debugging this part in netbeans is quite tricky Half of the time breakpoints are ignored in the inner classes.
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] (JENKINS-15701) Integrate branch gives "No changes to be integrated"
Tobias Dittrich
edited a comment on JENKINS-15701
Integrate branch gives "No changes to be integrated"
After looking around in the code I think I found the place where it goes wrong:
FeatureBranchProperty.java
final SVNException eureka = new SVNException(null);
try {
cm.getLogClient().doLog(new File[]{mr},mergeRev,SVNRevision.create(lastIntegrationSourceRevision),mergeRev,true,false,-1,new ISVNLogEntryHandler() {
public void handleLogEntry(SVNLogEntry e) throws SVNException {
if (e.getMessage().startsWith(RebaseAction.COMMIT_MESSAGE_PREFIX)
|| e.getMessage().startsWith(IntegrateAction.COMMIT_MESSAGE_PREFIX))
return; // merge commits
throw eureka;
}
});
// didn't find anything interesting. all the changes are our merges
logger.println("No changes to be integrated. Skipping integration.");
return new IntegrationResult(0,mergeRev);
} catch (SVNException e) {
if (e!=eureka)
throw e; // some other problems
// found some changes, keep on integrating
}
It seems like eureka is handled gracefully in the parsing process and so the catch block is never reached.
I'm not 100 percent sure, though, because debugging this part in netbeans is quite tricky Half of the time breakpoints are ignored in the inner classes.
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] (JENKINS-15701) Integrate branch gives "No changes to be integrated"
Tobias Dittrich
commented on JENKINS-15701
Integrate branch gives "No changes to be integrated"
After looking around in the code I think I found the place where it goes wrong:
final SVNException eureka = new SVNException(null);
try {
cm.getLogClient().doLog(new File[]{mr},mergeRev,SVNRevision.create(lastIntegrationSourceRevision),mergeRev,true,false,-1,new ISVNLogEntryHandler() {
public void handleLogEntry(SVNLogEntry e) throws SVNException {
if (e.getMessage().startsWith(RebaseAction.COMMIT_MESSAGE_PREFIX)
|| e.getMessage().startsWith(IntegrateAction.COMMIT_MESSAGE_PREFIX))
return; // merge commits
throw eureka;
}
});
// didn't find anything interesting. all the changes are our merges
logger.println("No changes to be integrated. Skipping integration.");
return new IntegrationResult(0,mergeRev);
} catch (SVNException e) {
if (e!=eureka)
throw e; // some other problems
// found some changes, keep on integrating
}
It seems like eureka is handled gracefully in the parsing process and so the catch block is never reached.
I'm not 100 percent sure, though, because debugging this part in netbeans is quite tricky Half of the time breakpoints are ignored in the inner classes.
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] (JENKINS-15701) Integrate branch gives "No changes to be integrated"
Tobias Dittrich
updated JENKINS-15701
Integrate branch gives "No changes to be integrated"
Change By:
Tobias Dittrich
(02/Nov/12 11:16 AM)
Description:
# Create a project with "Accept Integration from Subversion feature branches"# SCM setting: check out trunk of a subversion project# build the trunk project# Create a feature branch from this project in jenkins (I called it "development")# build the branch project# integrate the build in the trunk - works correctly# change some files in the branch and commit those changes# build the branch project again# integrate the new build in the trunkGives:{quote}No changes to be integrated. Skipping integration.Completed{quote}
Expected: the modified files are merged into the trunk
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] (JENKINS-15701) Integrate branch gives "No changes to be integrated"
Tobias Dittrich
updated JENKINS-15701
Integrate branch gives "No changes to be integrated"
Change By:
Tobias Dittrich
(02/Nov/12 11:14 AM)
Description:
# Create a project with "Accept Integration from Subversion feature branches"#
SCM setting:
check out trunk of a subversion project# build the trunk project# Create a feature branch from this project in jenkins (I called it "development")# build the branch project# integrate the build in the trunk - works correctly# change some files in the branch and commit those changes# build the branch project again# integrate the new build in the trunkGives:{quote}No changes to be integrated. Skipping integration.Completed{quote}
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] (JENKINS-15701) Integrate branch gives "No changes to be integrated"
Tobias Dittrich created JENKINS-15701 Integrate branch gives "No changes to be integrated" Issue Type: Bug Assignee: Kohsuke Kawaguchi Components: svnmerge Created: 02/Nov/12 11:12 AM Description: Create a project with "Accept Integration from Subversion feature branches" check out trunk of a subversion project build the trunk project Create a feature branch from this project in jenkins (I called it "development") build the branch project integrate the build in the trunk - works correctly change some files in the branch and commit those changes build the branch project again integrate the new build in the trunk Gives: No changes to be integrated. Skipping integration. Completed Environment: svn, Version 1.6.17 (r1128011) (client version on jenkins) SVN/1.6.17 SVNKit/1.3.7-1 (http://svnkit.com/) t20111225_1716 (SVN Server version) Jenkins ver. 1.488 Jenkins svnmerge plugin 1.2 Project: Jenkins Priority: Critical Reporter: Tobias Dittrich 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
