Hangs Visual Studio 2012 When Using Merge Tool

google-code-export / progressive-scroll

Automatically exported from code.google.com/p/progressive-scroll

3 stars 0 forks source link

Hangs Visual Studio 2012 When Using Merge Tool #8

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago

What steps will reproduce the problem?
1. Get latest from TFS (and have conflicts)
2. Got to Resolve Conflicts tab
3. Click Merge Changes In Merge Tool

VS hangs and the merge tab opens, but never fully renders.  I left it running 
for about 10 minutes while I did something else and nothing happened.  
Processor utilization was a constant ~15% the whole time.

Disabling this extension fixes the problem.

Using the latest version of the plugin in VS 2012 on Windows 7 64 bit.

Original issue reported on code.google.com by dtander...@gmail.com on 17 Oct 2012 at 4:25

GoogleCodeExporter commented 9 years ago

Haven't reproduced this one, but I assume it's the same issue that occurs with 
comparing, which was reported on the VS gallery. The cause is a null pointer 
for the outlining manager because you can't collapse functions/classes/regions 
in compare/merge mode. I should be able to come up with a fix this weekend.

Original comment by freaksken on 17 Oct 2012 at 8:53

Changed state: Accepted

GoogleCodeExporter commented 9 years ago

Original comment by freaksken on 17 Oct 2012 at 8:53

GoogleCodeExporter commented 9 years ago

I ended up disabling progressive scroll in merge/compare mode. I got it to 
work, sort of, but it seemed a bit crowded (especially in a 3-way merge).

Original comment by freaksken on 19 Oct 2012 at 7:33

Changed state: Fixed

GoogleCodeExporter commented 9 years ago

Original comment by freaksken on 15 May 2013 at 11:42

Changed state: Verified