I'm attempting to merge 2 branches with v2.0 of the client. When I get to the Retrieve Files from Server screen, I receive the error below. Has anybody encountered this, or found a workaround?
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.WorkingFolder.GetHashedPathName(String path)
at VaultClientOperationsLib.WorkingFolder.HasWorkingFolderData(String diskFolderPath, Boolean lookInWorkingFolder, TreeCache treeCache)
at VaultClientOperationsLib.ClientInstance.CreateGetFileRequests(VaultClientFile[] files, Boolean forceLatest, Boolean forceDisplayVersion, Boolean dontCheckWorkingFolders, MakeWritableType makeWritable, Boolean isLabelGet, String labelSubItemPath, Boolean isLabelGetForSingleFile)
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.5000.0
Win32 Version: 1.1.4322.573
CodeBase: file:///c:/windows/microsoft.net/framework/v1.1.4322/mscorlib.dll
----------------------------------------
VaultGUIClient
Assembly Version: 2.0.0.2120
Win32 Version: 2.0.0.2120
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultGUIClient.exe
----------------------------------------
VaultPresentationLib
Assembly Version: 2.0.0.2120
Win32 Version: 2.0.0.2120
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultPresentationLib.DLL
----------------------------------------
VaultClientUILib
Assembly Version: 2.0.0.2120
Win32 Version: 2.0.0.2120
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultClientUILib.DLL
----------------------------------------
System.Windows.Forms
Assembly Version: 1.0.5000.0
Win32 Version: 1.1.4322.573
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.573
CodeBase: file:///c:/windows/assembly/gac/system/1.0.5000.0__b77a5c561934e089/system.dll
----------------------------------------
VaultClientOperationsLib
Assembly Version: 2.0.0.2120
Win32 Version: 2.0.0.2120
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultClientOperationsLib.DLL
----------------------------------------
VaultLib
Assembly Version: 2.0.0.2120
Win32 Version: 2.0.0.2120
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultLib.DLL
----------------------------------------
System.Drawing
Assembly Version: 1.0.5000.0
Win32 Version: 1.1.4322.573
CodeBase: file:///c:/windows/assembly/gac/system.drawing/1.0.5000.0__b03f5f7f11d50a3a/system.drawing.dll
----------------------------------------
VaultClientNetLib
Assembly Version: 2.0.0.2120
Win32 Version: 2.0.0.2120
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/VaultClientNetLib.DLL
----------------------------------------
System.Web.Services
Assembly Version: 1.0.5000.0
Win32 Version: 1.1.4322.573
CodeBase: file:///c:/windows/assembly/gac/system.web.services/1.0.5000.0__b03f5f7f11d50a3a/system.web.services.dll
----------------------------------------
System.Xml
Assembly Version: 1.0.5000.0
Win32 Version: 1.1.4322.573
CodeBase: file:///c:/windows/assembly/gac/system.xml/1.0.5000.0__b77a5c561934e089/system.xml.dll
----------------------------------------
System.Web
Assembly Version: 1.0.5000.0
Win32 Version: 1.1.4322.573
CodeBase: file:///c:/windows/assembly/gac/system.web/1.0.5000.0__b03f5f7f11d50a3a/system.web.dll
----------------------------------------
mnq9es2j
Assembly Version: 0.0.0.0
Win32 Version: 1.1.4322.573
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.573
CodeBase: file:///c:/windows/assembly/gac/system.management/1.0.5000.0__b03f5f7f11d50a3a/system.management.dll
----------------------------------------
VCDiff
Assembly Version: 2.0.0.2120
Win32 Version: 2.0.0.2120
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: 2.0.0.2120
Win32 Version: 2.0.0.2120
CodeBase: file:///C:/Program%20Files/SourceGear/Vault%20Client/SGDiff.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.
Merge Bug 2.0
Moderator: SourceGear
Not sure what the error is, but if your working folders are completely up to date (there is nothing to be checked in), you could try a work-around of specifying a new working folder for both branches, and see if that helps any.
Can you tell which file it seems to be failing on, and if there is anything special about that file (e.g., it is shared or pinned, binary/text, currently checked out, etc)?
Can you tell which file it seems to be failing on, and if there is anything special about that file (e.g., it is shared or pinned, binary/text, currently checked out, etc)?
Merge Bug 2.0
I haven't been able to isolate the file. I tried setting new working folders for both branches, did a complete get recursive on each branch, then ran the wizard, and encountered the same error. I'm setting the working folders at the top of each branch, and then letting the individual folders inherit, which I assume would work correctly. I also tried to merge at a subfolder level, thinking that I could isolate the file that is causing the issue, but I get even stranger errors with that approach. Are there any other logs or anything I can forward for diagnosis?
Another merge bug
I finally found a single subfolder that the merge wizard doesn't choke on. 3 files are correctly checked out into my pending change set. I approved of the merge, so I clicked the commit button. The status changed to "working", and has been stuck there for 20 mintues now. How long should it take to commit 3 files? Something seems seriously wrong with the merge process....help????
Did you provide the same working folder to both branches? (i.e., did you are specify the same working folder for both the origin and the target folders)? If so, that would be very very bad - you have to specify different working folders, so there is no chance the client could get confused as to which file in the folder belongs to which branch.
