[JIRA] (JENKINS-15701) Integrate branch gives "No changes to be integrated"

Tue, 06 Nov 2012 00:21:56 -0800

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

Reply via email to