NullReferenceException in Merge Branches

[mattFleming]

Recently we branched our codebase. Now we would like to merge in a few changes that we had made to the main codebase. So we opened up the Merge Branches tool and went to work. When we got to the Renames step we got the following error dialog:

See the end of this message for details on invoking
just-in-time (JIT) debugging instead of this dialog box.

************** Exception Text **************
System.NullReferenceException: Object reference not set to an instance of an object.
at VaultClientOperationsLib.MergeBranchesOpList.Merge(VaultClientFolder targetFolder, VaultClientFolder originFolderBegin, VaultClientFolder originFolderEnd)
at VaultClientOperationsLib.ClientInstance.CalculateMergeOpList(VaultClientFolder targetFolder, VaultClientFolder originFolderBegin, VaultClientFolder originFolderEnd, MergeBranchesOpFilter filter)
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.5000.0
Win32 Version: 1.1.4322.2032
CodeBase: file:///c:/windows/microsoft.net/framework/v1.1.4322/mscorlib.dll
----------------------------------------
VaultGUIClient
Assembly Version: 3.0.1.2769
Win32 Version: 3.0.1.2769
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultGUIClient.exe
----------------------------------------
VaultLib
Assembly Version: 3.0.1.2769
Win32 Version: 3.0.1.2769
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultLib.DLL
----------------------------------------
VaultPresentationLib
Assembly Version: 3.0.1.2769
Win32 Version: 3.0.1.2769
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultPresentationLib.DLL
----------------------------------------
VaultClientUILib
Assembly Version: 3.0.1.2769
Win32 Version: 3.0.1.2769
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultClientUILib.DLL
----------------------------------------
System.Windows.Forms
Assembly Version: 1.0.5000.0
Win32 Version: 1.1.4322.2032
CodeBase: file:///c:/windows/assembly/gac/system.windows.forms/1.0.5000.0__b77a5c561934e089/system.windows.forms.dll
----------------------------------------
System
Assembly Version: 1.0.5000.0
Win32 Version: 1.1.4322.2032
CodeBase: file:///c:/windows/assembly/gac/system/1.0.5000.0__b77a5c561934e089/system.dll
----------------------------------------
VaultClientOperationsLib
Assembly Version: 3.0.1.2769
Win32 Version: 3.0.1.2769
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultClientOperationsLib.DLL
----------------------------------------
System.Xml
Assembly Version: 1.0.5000.0
Win32 Version: 1.1.4322.2032
CodeBase: file:///c:/windows/assembly/gac/system.xml/1.0.5000.0__b77a5c561934e089/system.xml.dll
----------------------------------------
System.Drawing
Assembly Version: 1.0.5000.0
Win32 Version: 1.1.4322.2032
CodeBase: file:///c:/windows/assembly/gac/system.drawing/1.0.5000.0__b03f5f7f11d50a3a/system.drawing.dll
----------------------------------------
VaultClientNetLib
Assembly Version: 3.0.1.2769
Win32 Version: 3.0.1.2769
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultClientNetLib.DLL
----------------------------------------
System.Web.Services
Assembly Version: 1.0.5000.0
Win32 Version: 1.1.4322.2032
CodeBase: file:///c:/windows/assembly/gac/system.web.services/1.0.5000.0__b03f5f7f11d50a3a/system.web.services.dll
----------------------------------------
System.Web
Assembly Version: 1.0.5000.0
Win32 Version: 1.1.4322.2032
CodeBase: file:///c:/windows/assembly/gac/system.web/1.0.5000.0__b03f5f7f11d50a3a/system.web.dll
----------------------------------------
toc_uvew
Assembly Version: 0.0.0.0
Win32 Version: 1.1.4322.2032
CodeBase: file:///c:/windows/assembly/gac/system/1.0.5000.0__b77a5c561934e089/system.dll
----------------------------------------
System.Management
Assembly Version: 1.0.5000.0
Win32 Version: 1.1.4322.2032
CodeBase: file:///c:/windows/assembly/gac/system.management/1.0.5000.0__b03f5f7f11d50a3a/system.management.dll
----------------------------------------
VCDiff
Assembly Version: 3.0.1.2769
Win32 Version: 3.0.1.2769
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
----------------------------------------

************** JIT Debugging **************
To enable just in time (JIT) debugging, the config file for this
application or machine (machine.config) must have the
jitDebugging value set in the system.windows.forms section.
The application must also be compiled with debugging
enabled.

For example:

<configuration>
<system.windows.forms jitDebugging="true" />
</configuration>

When JIT debugging is enabled, any unhandled exception
will be sent to the JIT debugger registered on the machine
rather than being handled by this dialog.

[ericsink]

Ouch! We'll investigate this right away.

[ericsink]

Actually...

Can you email me so I can ask some more specific questions about what happened?

eric@sourcegear.com