Community
Participate
Working Groups
Consider the following use case: A piece of work is done which is generic, and is carried out on an ATS-generated child of a major branch. The work is completed, and committed back to the major branch. The major branch has several children, which are projects using the generic "core" set of requirements, plus their own additional requirements. One of these projects wants to use this particular piece of generic work, but does not want to pick up the latest revisions to other areas of the core. In OSEE 0.7, this was easily done, as the branch on which the work was done could be committed to its parent, but then also committed to any other branch by an administrator. In OSEE 0.9.1, an attempt to commit the branch a second time using "Commit Into" starts off fine - OSEE checks for conflicts and, if there are none (our usual case for this mode of working) comes up with the "Commit Branch" question box. Clicking OK yields an error message: Error with [BRANCH_COMMIT_REQUEST] Error with [BRANCH_COMMIT_REQUEST] Error during POST [http://OSEE:8089/osee/branch?sessionId=AALmUz3pwDJZjYV51BAA&function=BRANCH_COMMIT] - status code: [500] Looking in the error log, the actual error is: at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:520) Caused by: java.lang.Exception: Commit: [J9PB8 - Capture EVCM chan]->[C573 - Gordon Murray Desi]: Commit Database Operation: A branch can not be commited without any changes made. at org.eclipse.osee.framework.branch.management.commit.CommitDbOperation.doTxWork(CommitDbOperation.java:104) Now, it is true that no changes have been made since it was committed but, given that OSEE (rightly) won't let you change it after it has been committed, this prevents the use case. A possible workaround, so I thought, would be to create a branch from the committed branch, make a single dummy change on that, and then attempt to commit it. This does not work because of bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=311151
I was able to repeat the same exception "A branch can not be commited without any changes made.": 1) created action and associated working branch 2) committed into the parent from the ATS action 3) unarchived the branch and used "Commit Into" to commit into another branch The problem is that in one part of the commit logic makes an invalid assumption that the destination branch is the parent branch. The result is that when that comparison is made no changes are found because the parent matches the working branch since the changes from the working branch have already been committed into the parent.
committed fix in revision 29570 on trunk. The same changes wheere also applied to the 0.9.4 branch
OSEE 0.9.4 has been released.
