Search found 7 matches

by dpwrussell
Mon Sep 08, 2014 10:53 am
Forum: Support (DiffMerge)
Topic: Crash on diff
Replies: 10
Views: 13971

Re: Crash on diff

It looks like it's a bug that will need to go to a developer, but we've found a way around it. On the machine that needs to perform the Diff, launch the DiffMerge GUI application. Then go to DiffMerge - Preferences - File Windows - Detail level. Change teh Multi-Line Intra-Line Analysis Detail Leve...
by dpwrussell
Fri Sep 05, 2014 10:15 am
Forum: Support (DiffMerge)
Topic: Crash on diff
Replies: 10
Views: 13971

Re: Crash on diff

Thanks for sending the files. I've reproduced the issue, but haven't figured out the problem. I can perform the Diff just fine with the GUI client and I can perform the Diff with the base file on the left or the right instead of in the center. Yeah, The error on applyIntraLineImportance3() does sou...
by dpwrussell
Fri Sep 05, 2014 2:24 am
Forum: Support (DiffMerge)
Topic: Crash on diff
Replies: 10
Views: 13971

Re: Crash on diff

Sorry, didn't notice these 2 questions at the end. Are you able to try this on another machine? Sorry, not at the moment. But as I attached you might be able to reproduce the error. Are your permissions different for these files? Nope and as the error only occurs when the files are fed to diffmerge ...
by dpwrussell
Thu Sep 04, 2014 9:30 am
Forum: Support (DiffMerge)
Topic: Crash on diff
Replies: 10
Views: 13971

Re: Crash on diff

Do you have enough free disk space? Several hundred GBs. Is this on a Virtual machine? Nope Are you merging down to disk? I'm not sure what you mean exactly. This is how it is triggered from git: [mergetool "diffmerge"] cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE...
by dpwrussell
Thu Sep 04, 2014 8:21 am
Forum: Support (DiffMerge)
Topic: Crash on diff
Replies: 10
Views: 13971

Re: Crash on diff

Additional Information: Process: DiffMerge [59565] Path: /Applications/DiffMerge.app/Contents/MacOS/DiffMerge Identifier: com.sourcegear.DiffMerge Version: 4.2.0 (4.2.0.697) Code Type: X86-64 (Native) Parent Process: sh [59563] Responsible: iTerm [677] User ID: 501 Date/Time: 2014-09-04 11:20:40.248...
by dpwrussell
Thu Sep 04, 2014 5:02 am
Forum: Support (DiffMerge)
Topic: Assert failure when merging
Replies: 3
Views: 4534

Re: Assert failure when merging

I didn't notice this post until after I made mine, sorry! But I seem to have the same problem, but on OSX. More details in the post I made.
by dpwrussell
Thu Sep 04, 2014 5:00 am
Forum: Support (DiffMerge)
Topic: Crash on diff
Replies: 10
Views: 13971

Crash on diff

DiffMerge: 4.2.0 Platform: OSX Mavericks This only seems to happen on this one diff, not sure why. DiffMerge is working fine the rest of the time. DiffMerge opens and presents the list of left/right/conflicts, and then immediately crashes. In the console: $ git mergetool Merging: components/tools/Om...