Merge report

[Bas Hamer]

I was wondering if there is any documentation as to how Sourcegear Vault is working w/ trunks and branches.

We have been merging changed in the brach into the trunk piece meal but it seems that we have missed a few. and now we are having a hell of a time trying to track back the missing merges.

If there is an easier way to do this, or there is a way to report on this, please let me know.

Thanks,

Bas

[Beth]

Our view on that can be found in the KB articlesunder the section called "Source Control Commands and Practices". Eric Sink also wrote about that in his Source Control How To.

In the history, you will be able to see what items were branched, and diffs can show changes. The web client will also be able to show changes made to files. Using this would take a little bit of time to see what was and wasn't done, but the information is there.

If all the changes are needed, the easiest way to deal with this is to perform a full merge branches and commit everything. If something is already there, Vault will detect that. If that's not the case, then you will want to make use of labels and comments to help keep track of what's going on. [/url]

[Bas Hamer]

hrmmm.... I'm afraid that doing a file by file check will not be feasable.

please consider this as a feature enhancement, I have to say that I'm suprised the functionality isn't there.

[Beth]

There's one item I missed mentioning before. In history, if you include comments to view, and no custom comments were entered, you will see the merges listed that were performed in the comments. Will that cover what you need? If not, just describe for me in detail what you want to see and I'll add in a feature request.

[Bas Hamer]

In detail:
There is a trunk T and a Branch B

A number of changes have been made in B.
Some of these changes have been promoted to T

I want to run a report to find any missing changes that have not been promoted to T.

[Beth]

Ok, I'll enter the request. Thanks for the feedback.

[bjs]

I posted a similar request with an example of the kind of reporting that might be useful in defining the new feature. Of note, the information needs to be able to accommodate more than just two branches. Here is the link to my post:

http://support.sourcegear.com/viewtopic ... 9292#29292

Thanks,
BJ Safdie
HCA Physician Services

[Beth]

Got it and added the additional information to the feature request. Thanks for the feedback.