Re: Why is examining changes during Merge so hard?
Re: Why is examining changes during Merge so hard?
- Subject: Re: Why is examining changes during Merge so hard?
- From: Jerry Krinock <email@hidden>
- Date: Tue, 11 Nov 2014 09:22:21 -0500
> On 2014 Nov 09, at 09:41, Scott Ribe <email@hidden> wrote:
>
> I use SourceTree, and it makes that easy …
Thank you, Scott. I try and avoid jumping into new tools and techniques because, you know, just around the time I invest myself past the knee of the learning curve, the community of young developer kids and/or Apple decide to dump it and move on to something newer.
But I might have to bite the bullet on this one, because in the project I work on every day, Xcode 6 is consistently crashing on me after I've flipped the “Choose Left”, “Choose Right” controls back and forth in a file, then click the next file in the list. Sometimes it crashes even if I’ve just *looked* at a file. Also, the “Merge” button in the sheet often remains disabled even after I have resolved all conflicts. (The C remains, not red but black.)
Jerry
Typical crash:
Process: Xcode [31739]
Path: /Applications/Xcode.app/Contents/MacOS/Xcode
Identifier: com.apple.dt.Xcode
Version: 6.1 (6604)
Build Info: IDEFrameworks-6604000000000000~2
App Item ID: 497799835
App External ID: 752282650
Code Type: X86-64 (Native)
Parent Process: ??? [1]
Responsible: Xcode [31739]
User ID: 501
Date/Time: 2014-11-11 08:47:13.001 -0500
OS Version: Mac OS X 10.10.1 (14B17)
Report Version: 11
Anonymous UUID: CBF707B6-7638-964A-F2C6-56E3B2A70477
Sleep/Wake UUID: 9D126E5E-0E39-469B-AD87-79F084369AC3
Time Awake Since Boot: 230000 seconds
Time Since Wake: 190 seconds
Crashed Thread: 0 Dispatch queue: com.apple.main-thread
Exception Type: EXC_BAD_ACCESS (SIGSEGV)
Exception Codes: KERN_INVALID_ADDRESS at 0x000007fec83996d8
VM Regions Near 0x7fec83996d8:
MALLOC_LARGE 00000001c17bc000-00000001c1ba6000 [ 4008K] rw-/rwx SM=PRV
-->
JS JIT generated code 00002fe16ae00000-00002fe16ae01000 [ 4K] ---/rwx SM=NUL
Application Specific Information:
objc_msgSend() selector name: needsUpdate
ProductBuildVersion: 6A1052d
Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0 libobjc.A.dylib 0x00007fff878710dd objc_msgSend + 29
1 com.apple.dt.DVTKit 0x000000010dc9aaa0 -[DVTSourceLandmarkItem needsUpdate] + 44
2 com.apple.dt.IDE.IDESourceEditor 0x0000000117b70611 -[IDESourceCodeEditor _isCurrentSelectedItemsValid] + 100
3 com.apple.dt.IDE.IDESourceEditor 0x0000000117b706c2 -[IDESourceCodeEditor _refreshCurrentSelectedItemsIfNeeded] + 42
4 com.apple.dt.IDE.IDESourceEditor 0x0000000117b13db7 -[IDESourceCodeEditor viewWillUninstall] + 127
5 com.apple.dt.DVTKit 0x000000010dc98714 -[DVTViewController _willUninstallContentView:] + 244
6 com.apple.dt.DVTKit 0x000000010dabb285 -[DVTControllerContentView _viewWillUninstall] + 226
7 com.apple.dt.DVTKit 0x000000010da9aa6b -[DVTControllerContentView viewWillMoveToWindow:] + 71
8 com.apple.AppKit 0x00007fff87d6e7af -[NSView _setWindow:] + 258
9 com.apple.CoreFoundation 0x00007fff87070365 __53-[__NSArrayM enumerateObjectsWithOptions:usingBlock:]_block_invoke + 133
10 com.apple.CoreFoundation 0x00007fff8706fa69 -[__NSArrayM enumerateObjectsWithOptions:usingBlock:] + 313
11 com.apple.AppKit 0x00007fff8845bfe4 __21-[NSView _setWindow:]_block_invoke727 + 169
12 com.apple.Foundation 0x00007fff8440a4ae -[NSISEngine withBehaviors:performModifications:] + 155
13 com.apple.AppKit 0x00007fff87d6f292 -[NSView _setWindow:] + 3045
14 com.apple.CoreFoundation 0x00007fff87070365 __53-[__NSArrayM enumerateObjectsWithOptions:usingBlock:]_block_invoke + 133
15 com.apple.CoreFoundation 0x00007fff8706fa69 -[__NSArrayM enumerateObjectsWithOptions:usingBlock:] + 313
16 com.apple.AppKit 0x00007fff8845bfe4 __21-[NSView _setWindow:]_block_invoke727 + 169
17 com.apple.Foundation 0x00007fff8440a4ae -[NSISEngine withBehaviors:performModifications:] + 155
18 com.apple.AppKit 0x00007fff87d6f292 -[NSView _setWindow:] + 3045
19 com.apple.CoreFoundation 0x00007fff87070365 __53-[__NSArrayM enumerateObjectsWithOptions:usingBlock:]_block_invoke + 133
20 com.apple.CoreFoundation 0x00007fff8706fa69 -[__NSArrayM enumerateObjectsWithOptions:usingBlock:] + 313
21 com.apple.AppKit 0x00007fff8845bfe4 __21-[NSView _setWindow:]_block_invoke727 + 169
22 com.apple.Foundation 0x00007fff8440a4ae -[NSISEngine withBehaviors:performModifications:] + 155
23 com.apple.AppKit 0x00007fff87d6f292 -[NSView _setWindow:] + 3045
24 com.apple.CoreFoundation 0x00007fff87070365 __53-[__NSArrayM enumerateObjectsWithOptions:usingBlock:]_block_invoke + 133
25 com.apple.CoreFoundation 0x00007fff8706fa69 -[__NSArrayM enumerateObjectsWithOptions:usingBlock:] + 313
26 com.apple.AppKit 0x00007fff8845bfe4 __21-[NSView _setWindow:]_block_invoke727 + 169
27 com.apple.Foundation 0x00007fff8440a4ae -[NSISEngine withBehaviors:performModifications:] + 155
28 com.apple.AppKit 0x00007fff87d6f292 -[NSView _setWindow:] + 3045
29 com.apple.CoreFoundation 0x00007fff87070365 __53-[__NSArrayM enumerateObjectsWithOptions:usingBlock:]_block_invoke + 133
30 com.apple.CoreFoundation 0x00007fff8706fa69 -[__NSArrayM enumerateObjectsWithOptions:usingBlock:] + 313
31 com.apple.AppKit 0x00007fff8845bfe4 __21-[NSView _setWindow:]_block_invoke727 + 169
32 com.apple.Foundation 0x00007fff8440a4ae -[NSISEngine withBehaviors:performModifications:] + 155
33 com.apple.AppKit 0x00007fff87d6f292 -[NSView _setWindow:] + 3045
34 com.apple.CoreFoundation 0x00007fff87070365 __53-[__NSArrayM enumerateObjectsWithOptions:usingBlock:]_block_invoke + 133
35 com.apple.CoreFoundation 0x00007fff8706fa69 -[__NSArrayM enumerateObjectsWithOptions:usingBlock:] + 313
36 com.apple.AppKit 0x00007fff8845bfe4 __21-[NSView _setWindow:]_block_invoke727 + 169
37 com.apple.Foundation 0x00007fff8440a4ae -[NSISEngine withBehaviors:performModifications:] + 155
38 com.apple.AppKit 0x00007fff87d6f292 -[NSView _setWindow:] + 3045
39 com.apple.CoreFoundation 0x00007fff87070365 __53-[__NSArrayM enumerateObjectsWithOptions:usingBlock:]_block_invoke + 133
40 com.apple.CoreFoundation 0x00007fff8706fa69 -[__NSArrayM enumerateObjectsWithOptions:usingBlock:] + 313
41 com.apple.AppKit 0x00007fff8845bfe4 __21-[NSView _setWindow:]_block_invoke727 + 169
42 com.apple.Foundation 0x00007fff8440a4ae -[NSISEngine withBehaviors:performModifications:] + 155
43 com.apple.AppKit 0x00007fff87d6f292 -[NSView _setWindow:] + 3045
44 com.apple.CoreFoundation 0x00007fff87070365 __53-[__NSArrayM enumerateObjectsWithOptions:usingBlock:]_block_invoke + 133
45 com.apple.CoreFoundation 0x00007fff8706fa69 -[__NSArrayM enumerateObjectsWithOptions:usingBlock:] + 313
46 com.apple.AppKit 0x00007fff8845bfe4 __21-[NSView _setWindow:]_block_invoke727 + 169
47 com.apple.Foundation 0x00007fff8440a4ae -[NSISEngine withBehaviors:performModifications:] + 155
48 com.apple.AppKit 0x00007fff87d6f292 -[NSView _setWindow:] + 3045
49 com.apple.AppKit 0x00007fff87d70292 -[NSView removeFromSuperview] + 453
50 com.apple.AppKit 0x00007fff87dc48fa -[NSView removeFromSuperviewWithoutNeedingDisplay] + 38
51 com.apple.dt.IDEKit 0x000000010e83f18d -[IDEEditorContext setupNewEditor:] + 788
52 com.apple.dt.IDEKit 0x000000010e840e32 __91-[IDEEditorContext _openNavigableItem:documentExtension:document:shouldInstallEditorBlock:]_block_invoke + 1311
53 com.apple.dt.IDEKit 0x000000010e693d5b -[IDEEditorContext _performBlockInsideReentrantGuard:] + 132
54 com.apple.dt.IDEKit 0x000000010e693bae -[IDEEditorContext _openNavigableItem:documentExtension:document:shouldInstallEditorBlock:] + 3521
55 com.apple.dt.IDEKit 0x000000010e6c75c5 -[IDEEditorContext _openNavigableItem:withContentsOfURL:documentExtension:shouldInstallEditorBlock:] + 1713
56 com.apple.dt.IDEKit 0x000000010e6f7560 -[IDEEditorContext _openNavigableItem:withContentsOfURL:shouldInstallEditorBlock:] + 989
57 com.apple.dt.IDEKit 0x000000010e84295d -[IDEEditorContext _notifyDelegateAndOpenNavigableItem:withContentsURL:documentExtensionIdentifier:locationToSelect:annotationRepresentedObject:stateDictionary:annotationWantsIndicatorAnimation:exploreAnnotationRepresentedObject:highlightSelection:skipSubDocumentNavigationUnlessEditorIsReplaced:] + 3713
58 com.apple.dt.IDEKit 0x000000010e70ba85 -[IDEEditorContext _notifyDelegateAndOpenEditorOpenSpecifier:updateHistory:] + 1088
59 com.apple.dt.IDEKit 0x000000010e70b2b4 -[IDEEditorContext _openEditorOpenSpecifier:updateHistory:] + 430
60 com.apple.dt.IDEKit 0x000000010e70b0e9 -[IDEEditorContext openEditorOpenSpecifier:] + 261
61 com.apple.dt.IDEKit 0x000000010e984e09 __46-[IDEReviewFilesViewController viewDidInstall]_block_invoke_3 + 182
62 com.apple.dt.IDEKit 0x000000010e984c40 __46-[IDEReviewFilesViewController viewDidInstall]_block_invoke_2 + 603
63 com.apple.dt.DVTFoundation 0x000000010d65c22b __73-[DVTObservingBlockToken observeValueForKeyPath:ofObject:change:context:]_block_invoke183 + 83
64 com.apple.dt.DVTFoundation 0x000000010d5d8028 DVTInvokeWithStrongOwnership + 75
65 com.apple.dt.DVTFoundation 0x000000010d48b8fc -[DVTObservingBlockToken observeValueForKeyPath:ofObject:change:context:] + 328
66 com.apple.Foundation 0x00007fff843c1c73 NSKeyValueNotifyObserver + 382
67 com.apple.Foundation 0x00007fff843c0e48 NSKeyValueDidChange + 463
68 com.apple.Foundation 0x00007fff843c59ad -[NSObject(NSKeyValueObserverNotification) didChangeValueForKey:] + 118
69 com.apple.dt.IDEKit 0x000000010e750bf7 -[IDEReviewFilesNavigator updateSelectedDocumentLocation] + 302
70 com.apple.dt.IDEKit 0x000000010e7507c6 -[IDEReviewFilesNavigator outlineViewSelectionDidChange:] + 302
71 com.apple.dt.IDEKit 0x000000010e6e7dd2 -[_IDENavigatorOutlineViewDataSource outlineViewSelectionDidChange:] + 134
72 com.apple.CoreFoundation 0x00007fff8710bcbc __CFNOTIFICATIONCENTER_IS_CALLING_OUT_TO_AN_OBSERVER__ + 12
73 com.apple.CoreFoundation 0x00007fff86ffd1b4 _CFXNotificationPost + 3140
74 com.apple.Foundation 0x00007fff843baea1 -[NSNotificationCenter postNotificationName:object:userInfo:] + 66
75 com.apple.dt.DVTFoundation 0x000000010d62bd1e -[NSNotificationCenter(DVTNSNotificationCenterAdditions) _dvt_postNotificationName:object:userInfo:] + 125
76 com.apple.AppKit 0x00007fff87e64587 -[NSTableView _sendSelectionChangedNotificationForRows:columns:] + 175
77 com.apple.AppKit 0x00007fff87dbcd13 -[NSTableView _enableSelectionPostingAndPost] + 409
78 com.apple.AppKit 0x00007fff87f236fb -[NSTableView mouseDown:] + 5984
79 com.apple.AppKit 0x00007fff8801b31f -[NSOutlineView mouseDown:] + 74
80 com.apple.dt.IDEKit 0x000000010e72965a -[IDENavigatorOutlineView mouseDown:] + 416
81 com.apple.AppKit 0x00007fff88481f7f -[NSWindow _reallySendEvent:] + 12827
82 com.apple.AppKit 0x00007fff87f0c53c -[NSWindow sendEvent:] + 368
83 com.apple.AppKit 0x00007fff87ebe0c6 -[NSApplication sendEvent:] + 2238
84 com.apple.dt.IDEKit 0x000000010e6537f4 -[IDEApplication sendEvent:] + 924
85 com.apple.AppKit 0x00007fff87d4aec8 -[NSApplication run] + 711
86 com.apple.AppKit 0x00007fff87d36304 NSApplicationMain + 1832
87 libdyld.dylib 0x00007fff88be05c9 start + 1
Logical CPU: 0
Error Code: 0x020000b8
Trap Number: 133
Binary Images:
0x10d479000 - 0x10d479ff7 com.apple.dt.Xcode (6.1 - 6604) <C8B71594-717B-3353-B053-139C444DC0D7> /Applications/Xcode.app/Contents/MacOS/Xcode
0x10d484000 - 0x10d8b5ff7 com.apple.dt.DVTFoundation (6.1 - 6604) <6BD764CE-7762-3CF3-B6D6-732EE718C3ED>
. . .
External Modification Summary:
Calls made by other processes targeting this process:
task_for_pid: 118469
thread_create: 0
thread_set_state: 0
Calls made by this process:
task_for_pid: 0
thread_create: 0
thread_set_state: 0
Calls made by all processes on this machine:
task_for_pid: 44128492
thread_create: 0
thread_set_state: 16027
Model: MacBookAir6,2, BootROM MBA61.0099.B16, 2 processors, Intel Core i5, 1.3 GHz, 4 GB, SMC 2.13f12
Graphics: Intel HD Graphics 5000, Intel HD Graphics 5000, Built-In
Memory Module: BANK 0/DIMM0, 2 GB, DDR3, 1600 MHz, 0x02FE, 0x45424A3230554638454455302D474E2D4620
Memory Module: BANK 1/DIMM0, 2 GB, DDR3, 1600 MHz, 0x02FE, 0x45424A3230554638454455302D474E2D4620
AirPort: spairport_wireless_card_type_airport_extreme (0x14E4, 0x117), Broadcom BCM43xx 1.0 (7.15.124.12.10)
Bluetooth: Version 4.3.1f1 14950, 3 services, 27 devices, 1 incoming serial ports
Network Service: Wi-Fi, AirPort, en0
Serial ATA Device: APPLE SSD SM0256F, 251 GB
USB Device: Internal Memory Card Reader
USB Device: BRCM20702 Hub
USB Device: Bluetooth USB Host Controller
Thunderbolt Bus: MacBook Air, Apple Inc., 23.6
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden