Merge Branch Wizard - Exception during file retrieval step

[m_wood883]

I am trying to merge a branch version of my files back into the trunk version and when the merge wizard gets to the step where it is retrieving the source files I get an "Object reference not set to an instance of an object" error message.

The detail text of the error message reads:

************** Exception Text **************
System.NullReferenceException: Object reference not set to an instance of an object.
at VaultClientOperationsLib.ClientInstance.CreateGetFileRequests(VaultClientFile[] files, Boolean forceLatest, Boolean forceDisplayVersion, Boolean dontCheckWorkingFolders, MakeWritableType makeWritable)
at VaultClientOperationsLib.ClientInstance.GetToHiddenFolderOnly(VaultClientFile[] files, Boolean forceLatest)
at VaultClientOperationsLib.MergeBranchesOpList.GetFile(VaultClientFile f, VaultClientFile currentFile)
at VaultClientOperationsLib.MBOI_ModifyFile.RetrieveNeededFiles()
at VaultClientOperationsLib.MergeBranchesOpList.RetrieveNeededFiles()
at VaultClientPresentationLib.FormMergeBranchWizard.wizard1_AfterPageSelect(Object sender, EventArgs e)
at ActiproSoftware.Wizard.Wizard.ᐁ(EventArgs )
at ActiproSoftware.Wizard.Wizard.set_SelectedIndex(Int32 value)
at ActiproSoftware.Wizard.Wizard.ᐃ(WizardPageCancelEventArgs )
at ActiproSoftware.Wizard.Wizard.ᐍ(Object , EventArgs )
at System.Windows.Forms.Control.OnClick(EventArgs e)
at System.Windows.Forms.Button.OnClick(EventArgs e)
at System.Windows.Forms.Button.WndProc(Message& m)
at System.Windows.Forms.ControlNativeWindow.OnMessage(Message& m)
at System.Windows.Forms.ControlNativeWindow.WndProc(Message& m)
at System.Windows.Forms.NativeWindow.Callback(IntPtr hWnd, Int32 msg, IntPtr wparam, IntPtr lparam)


************** Loaded Assemblies **************
mscorlib
Assembly Version: 1.0.3300.0
Win32 Version: 1.0.3705.288
CodeBase: file:///c:/winnt/microsoft.net/framework/v1.0.3705/mscorlib.dll
----------------------------------------
VaultGUIClient
Assembly Version: 1.2.1.737
Win32 Version: 1.2.1.737
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultGUIClient.exe
----------------------------------------
VaultPresentationLib
Assembly Version: 1.2.1.737
Win32 Version: 1.2.1.737
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultPresentationLib.DLL
----------------------------------------
VaultClientUILib
Assembly Version: 1.2.1.737
Win32 Version: 1.2.1.737
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultClientUILib.DLL
----------------------------------------
System.Windows.Forms
Assembly Version: 1.0.3300.0
Win32 Version: 1.0.3705.288
CodeBase: file:///c:/winnt/assembly/gac/system.windows.forms/1.0.3300.0__b77a5c561934e089/system.windows.forms.dll
----------------------------------------
System
Assembly Version: 1.0.3300.0
Win32 Version: 1.0.3705.288
CodeBase: file:///c:/winnt/assembly/gac/system/1.0.3300.0__b77a5c561934e089/system.dll
----------------------------------------
VaultClientOperationsLib
Assembly Version: 1.2.1.737
Win32 Version: 1.2.1.737
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultClientOperationsLib.DLL
----------------------------------------
VaultLib
Assembly Version: 1.2.1.737
Win32 Version: 1.2.1.737
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultLib.DLL
----------------------------------------
System.Drawing
Assembly Version: 1.0.3300.0
Win32 Version: 1.0.3705.288
CodeBase: file:///c:/winnt/assembly/gac/system.drawing/1.0.3300.0__b03f5f7f11d50a3a/system.drawing.dll
----------------------------------------
VaultClientNetLib
Assembly Version: 1.2.1.737
Win32 Version: 1.2.1.737
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultClientNetLib.DLL
----------------------------------------
System.Web.Services
Assembly Version: 1.0.3300.0
Win32 Version: 1.0.3705.288
CodeBase: file:///c:/winnt/assembly/gac/system.web.services/1.0.3300.0__b03f5f7f11d50a3a/system.web.services.dll
----------------------------------------
System.Xml
Assembly Version: 1.0.3300.0
Win32 Version: 1.0.3705.288
CodeBase: file:///c:/winnt/assembly/gac/system.xml/1.0.3300.0__b77a5c561934e089/system.xml.dll
----------------------------------------
System.Web
Assembly Version: 1.0.3300.0
Win32 Version: 1.0.3705.288
CodeBase: file:///c:/winnt/assembly/gac/system.web/1.0.3300.0__b03f5f7f11d50a3a/system.web.dll
----------------------------------------
01rvrvel
Assembly Version: 0.0.0.0
Win32 Version: 1.0.3705.288
CodeBase: file:///c:/winnt/assembly/gac/system/1.0.3300.0__b77a5c561934e089/system.dll
----------------------------------------
System.Management
Assembly Version: 1.0.3300.0
Win32 Version: 1.0.3705.288
CodeBase: file:///c:/winnt/assembly/gac/system.management/1.0.3300.0__b03f5f7f11d50a3a/system.management.dll
----------------------------------------
VCDiff
Assembly Version: 1.2.1.737
Win32 Version: 1.2.1.737
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VCDiff.DLL
----------------------------------------
ActiproSoftware.Wizard
Assembly Version: 1.4.60.0
Win32 Version: 1.4.60.0
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/ActiproSoftware.Wizard.DLL
----------------------------------------
SGDiff
Assembly Version: 1.2.1.737
Win32 Version: 1.2.1.737
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/SGDiff.DLL
----------------------------------------

Needless to say, the merge fails at this point.

Any ideas as to what is happening here? And how to correct it?

[ericsink]

I believe you are experiencing a known bug which has been fixed for the upcoming 3.0 release. It only happens under certain circumstances, and only when the user option "Store working folder data inside working folders" is not checked. Switching this option should serve as a workaround. Note, however, that switching this option will require you to re-fetch a new working folder.

Sorry for this inconvenience.