SourceGear Support

Jason, It's too late for you to try this now, and it sounds like it may have been a real pain for you anyway, but... When I did my import from VSS to Vault I took advantage of the ability to map a VSS user to a different Vault user to unify my old and new VSS users to be the same new account. It mad...

I just realized I hadn't posted a followup to the successful resolution of my problem. After much back and forth w/ Eric (and a special build with additional logging) we figured out that the problem was a shared file being changed in multiple places. The merge branches was attempting to check it out...

FYI, at least for VS 2003, it is possible to only have to update the MSSCCPRJ.SCC files. However in order to do that, your project and solution files have to be in a very particular state, and I've only been able to maintain that state by hand editing the project and solution files, which is a pain ...

... and I just realised it presents a problem for my scenario! As soon as a new file is created in a folder in In Development that is shared into Released for Testing and Released for Production, the file appears in both other projects. I haven't actually ever done any pinning, but I would have ass...

Thanks Linda,
I've done that and Eric got it. We're still not sure what's causing the problem. Eric suggested that I try to break the merge up (ie fewer changesets at once), so I'm going to give that a try tomorrow.

Mike

OK, well I used tail to check out the end of the client log file but didn't see anything indicating a problem. I've zipped the log file so it's only 58MB, can I get it to you somehow? the last lines look like: 1/13/2006 9:54:40 PM <checkoutlist>: [GUIClientWorkerThread:3708] FileID 219861: 1/13/2006...

Thanks. Mostly that's why I let you know of these issues. I know I had mentioned the lack of information while merging before and so unfortunately when I ran into it again it was frustrating me so I expressed myself a little strongly. Since I hadn't heard back from you on what debug settings to use,...

That sounds great Eric. Thank you for sharing.

Keep in mind the keyword expansion issue when testing

I may drop you an email when I get a chance later.

Thanks again,
Mike

I have no idea why it failed Eric, In many ways that was my point. Merge branches should really be giving more information, so that I know what's going on as it sits there, and so that when it fails I have some hope of knowing why. I looked at the server log file, but it's set to quiet logging and ...

This is getting aggravating. (almost forgot, I'm using 3.1.6 server and client) I've spent almost 5 hours now trying to get through the Merge Branches Wizard. This is my 2nd attempt where I got to this point and got the error message "Attempt to checkout files failed.". I have no idea why ...

I don't have anything to add, I just want to make my agreement with Don's comments (and with Greg's) known.

Mike

Eric, I was wondering if you could share some of how you're hoping to improve Vault's merge capabilities in 4.0. I've attached a diagram that illustrates a section of our source tree showing branches and merges. (We have more release branches and more development branches, but these were the ones I ...

Thanks Linda,
Mike

Linda, I've got a question. Is the checkout list that you are getting only the local checkout list, or is it the list of all files checked out in the repository along with all of the users who have each of those files checked out? I suspected that when you mentioned the working folder. I don't know ...

Thanks for the explanation Jeff, now I understand.

Mike