[SI] how to get a member-branch back to mainline w/o merging?

[JensN.]

Hi @all,

following situation: a user is working at file "a" in a Source-Project. The last revision of this file is 1.5. Another user is also working at this file, but has made a member-branch from 1.3., so he is working with revisions 1.3.1.x. After a while it will be decided that the work at the mainline will be stopped, and the branch 1.3.1.x will be "the mainline" from this moment. Because file "A" is a binary file there is no possibility to merge it. How can we get the back to the mainline? As the last revision in the branch is 1.3.1.3, we want to check it out and check it in as revision 1.6, but with no direct connection to 1.5. Is this possible?

Thanks, Jens

[hsprang]

Hello Jens,

we have a configuration that let's you "merge" even binary files (ok, not really, but at least you get the "arrow" showing a merge).

If you use Beyond Compare 3 as "Diff and Merge Tools" in the properties section of the Integrity client, it is possible to get the arrow.

You then just check out version 1.5, drag and drop the 1.3.1.3 to the working version, beyond compare opens, you ignore everything, just close the Beyond compare application, Integrity asks you it the "merge" was successful, you click "yes" and then you have the arrow. Then you can check-in normally (after manually copying the version 1.3.1.1) e.g. by giving the version a "2.0" for better understanding that this now is something new on the main branch.

Regards

Heike

[JensN.]

Hello Heike,

sorry for the delay and thanks for your answer. Because we didnt use Beyond Compare here in our company i have to try this with our tools or have to persuade our purchasing department to buy some licenses.

Your hint to change the revision to a new "major" version is really good

kind regards, Jens