Exception during merge

bcargill · Post by **bcargill** » Tue Mar 08, 2005 5:18 pm

I have been working in a branch of our codestream for several months. During this time, changes have proceeded in our main code stream. I am now ready to introduce my changes back to the main code stream. Before doing so, I have merged the changes from the main code stream into my branch- in order to do some validation-- so far so good.

Now, I'm ready to actually put the changes into main codestream. When doing the merge of the branch into main code stream I get the following:

VaultClientOperationsLib.GetLatestVersion FailedException
at VaultClientOperationsLib.ClientInstance.ProcessGetFileRequests
at VaultClientOperationsLib.ClientInstance.GetToHiddenFolderOnly
at VaultClientOperationsLib.MergeBranchesOpList.RetrieveNeededFiles
etc (let me know if you want rest of stack...)

In the listbox with progress output I get the following messages:
Local file update for <deleted>/RenderTD.cpp failed: System.NullReferenceException: Object reference not set to an instance of an object.

at VaultClientOperationsLib.UpdateThread.ProcessCommand(UpdateThreadCommand command, UpdateThreadCommandResult& outputResult)

Local file update for <deleted/>rnpdf.cpp failed: System.NullReferenceException: Object reference not set to an instance of an object.

etc...

Any help will be greatly appreciated- this will put my schedule in jepoardy!

mlippert · Post by **mlippert** » Tue Mar 08, 2005 5:29 pm

What version of Vault server and client are you using?

bcargill · Post by **bcargill** » Tue Mar 08, 2005 5:36 pm

Client&Server: 3.0.1

ericsink · Post by **ericsink** » Wed Mar 09, 2005 7:29 am

There is clearly a bug here, but it's rather obscure. This problem appears to be similar to one that somebody else had a few weeks ago, but we were never able to reproduce it here. I'd like to get this figured out and fixed.

Let me check my mail archive and see if I can figure out how the other customer worked around this problem.

ericsink · Post by **ericsink** » Wed Mar 09, 2005 8:11 am

ericsink wrote:There is clearly a bug here, but it's rather obscure. This problem appears to be similar to one that somebody else had a few weeks ago, but we were never able to reproduce it here. I'd like to get this figured out and fixed.

Let me check my mail archive and see if I can figure out how the other customer worked around this problem.

OK. Could you try this from another machine and see if the problem happens there as well? I suspect something in the client cache files is triggering the bug.

bcargill · Post by **bcargill** » Wed Mar 09, 2005 8:17 am

OK- I'll give it a shot from another machine-
I already tried uninstalling the client & removing the cached stuff in Doc&Settings- then reinstalled- still got same crash.

ericsink · Post by **ericsink** » Wed Mar 09, 2005 8:31 am

Feel free to send me email so we can work this out more directly.

eric@sourcegear.com

bcargill · Post by **bcargill** » Mon Mar 14, 2005 8:32 am

For anyone interested-
This issue turned out to be related to the renaming of a branch.
Changing the name back to its original name resolved the problem.
Also, it sounds like a fix is in the works...

ericsink · Post by **ericsink** » Mon Mar 14, 2005 8:59 am

bcargill wrote:For anyone interested-
This issue turned out to be related to the renaming of a branch.
Changing the name back to its original name resolved the problem.
Also, it sounds like a fix is in the works...

Yep -- Vault 3.0.6 will contain a fix for this problem. Thanks for Bryan for his help.