Here is our situation, and i want to know if this will work with CodeCollaborator.
We use have a main dev branch, and all of our enhancements are branches off the main line. The life of an enhancement branch varies from a few hours to a few months.
During the life of an enhancement branch, it is sometimes necessary to merge into the enhancement branch from the main branch, or from another enhancement branch.
Within the enhancement branch, we do our coding, then developer testing, then code review, code review rework, QA on the branch, and then merge the branch back into the main dev branch.
So, from a code review perspective, we usually have a number of changeset's that have been committed to the branch that we want reviewed, but we don't want to review the changes made when merging up from the main branch because that has already been reviewed. So, optimally, we would like the ability to manually select a set of changesets from the branch, and have them all added to the code review, and if a file is modified by multiple change sets, the review simply shows the ending version verses the original version.
Another way of stating it:
* branch 'feature' off of the trunk has commits A-F
* A and B are normal commit straight to the branch
* C is a merge commit that picks up change X from the trunk
* D and E are more simple changes to the feature branch
* F is another merge that picks up change Y from the trunk
* G is more changes to the feature branch.
And we want to be able to review A, B, D, E, and G.
Fog Creek's Kiln solution does allow us to gather the changes like we desire, but I am interested to see if Crucible provides similar capabilities. I am just trying to figure out if we can consolidate enhancement branch changesets in an efficient manner using your tool.
Thank you for any information you can provide.
- David.
