Bug 1729 - Error in merge widget when quitting MD
Summary: Error in merge widget when quitting MD
Status: RESOLVED FIXED
Alias: None
Product: Xamarin Studio
Classification: Desktop
Component: Version Control ()
Version: Trunk
Hardware: PC Mac OS
: --- normal
Target Milestone: ---
Assignee: Mike Krüger
URL:
Depends on:
Blocks:
 
Reported: 2011-10-27 11:40 UTC by Mikayla Hutchinson [MSFT]
Modified: 2011-11-07 09:00 UTC (History)
2 users (show)

Tags:
Is this bug a regression?: ---
Last known good build:

Notice (2018-05-24): bugzilla.xamarin.com is now in read-only mode.

Please join us on Visual Studio Developer Community and in the Xamarin and Mono organizations on GitHub to continue tracking issues. Bugzilla will remain available for reference in read-only mode. We will continue to work on open Bugzilla bugs, copy them to the new locations as needed for follow-up, and add the new items under Related Links.

Our sincere thanks to everyone who has contributed on this bug tracker over the years. Thanks also for your understanding as we make these adjustments and improvements for the future.


Please create a new report on Developer Community or GitHub with your current version information, steps to reproduce, and relevant error messages or log files if you are hitting an issue that looks similar to this resolved bug and you do not yet see a matching new report.

Related Links:
Status:
RESOLVED FIXED

Description Mikayla Hutchinson [MSFT] 2011-10-27 11:40:59 UTC
To reproduce:
1) Open solution with git enabled
2) Switch to merge widget
3) Close MD

Happens with the tip of the GTK# 2.12 branch.

ERROR [2011-10-27 16:34:08Z]: Unhandled Exception
System.Reflection.TargetInvocationException: Exception has been thrown by the target of an invocation. ---> System.NullReferenceException: Object reference not set to an instance of an object
  at MonoDevelop.VersionControl.Views.MergeWidget.OnDestroyed () [0x00000] in <filename unknown>:0 
  at Gtk.Object.NativeDestroy (System.Object o, System.EventArgs args) [0x00000] in <filename unknown>:0 
  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&)
  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00000] in <filename unknown>:0 
  --- End of inner exception stack trace ---
  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00000] in <filename unknown>:0 
  at System.Reflection.MethodBase.Invoke (System.Object obj, System.Object[] parameters) [0x00000] in <filename unknown>:0 
  at System.Delegate.DynamicInvokeImpl (System.Object[] args) [0x00000] in <filename unknown>:0 
  at System.MulticastDelegate.DynamicInvokeImpl (System.Object[] args) [0x00000] in <filename unknown>:0 
  at System.Delegate.DynamicInvoke (System.Object[] args) [0x00000] in <filename unknown>:0 
  at GLib.Signal.ClosureInvokedCB (System.Object o, GLib.ClosureInvokedArgs args) [0x00000] in <filename unknown>:0 
  at GLib.SignalClosure.Invoke (GLib.ClosureInvokedArgs args) [0x00000] in <filename unknown>:0 
  at GLib.SignalClosure.MarshalCallback (IntPtr raw_closure, IntPtr return_val, UInt32 n_param_vals, IntPtr param_values, IntPtr invocation_hint, IntPtr marshal_data) [0x00000] in <filename unknown>:0 
^C
Comment 1 Mike Krüger 2011-10-27 14:12:41 UTC
fixed.

btw. why it's the merge view showing up all the time ?
Comment 2 Mikayla Hutchinson [MSFT] 2011-10-27 14:46:12 UTC
Maybe it has something to do with the recent changes to the attaching of VCS views.
Comment 3 Alan McGovern 2011-11-07 09:00:04 UTC
The reasons why I changed it so this view always shows up is that:

1) We always show the diff view whether or not there's an actual diff, therefore I felt it was more consistent to display the merge view in the same way

2) We didn't (and still don't) listen for version control state change events so if a document entered the merge conflict state while it was already open, the merge control tab would only appear if you closed and reopened the document

3) I've been using MD for months and I installed a separate merge conflict resolving tool because I didn't realise MD had any kind of support for this as the tab never appeared for me.