Too slow entering manual alignment markers

Support for our DiffMerge utility.

Moderator: SourceGear


Posts: 8
Joined: Wed Apr 09, 2008 9:35 am
Location: CA, USA
PostPosted: Wed Apr 09, 2008 9:50 am
I'm using DiffMerge to view the differences in 2 moderate size files (one is 7000 lines, the other version is 5700 lines). They are reports from running a simulation. The files consist of a series of column formatted reports with page titles. The reports vary in width from about 60 columns to about 150 columns, but the width within a given report is fixed. The 3rd column in most of the reports is the measurement time and it is that column that must match in order for 2 records to be considered to be the same record. The smaller file is from a run that for some reason (the reason is what I am searching for) is occasionally skipping about an hours worth of measurements. When the gap is encountered, DiffMerge starts to compare records that are not to be compared with each other. I am therefore trying to insert a Manual Merge to re-sync the diff. When I click the INSERT button, it takes a couple of minutes before the hour glass goes away and I get control back.

Problem #1) I have to enter about 50 manual merge points. At 2 minutes each, it takes 2 hours to enter them. I would like to be able to enter several of them at once, then click an APPLY button.

Problem #2) When a Manual Merge point is entered by selecting 2 records with exact matching measurement times, sometimes DiffMerge will match those 2 records with each other, but about 30% of the time, it will match one of the selected records with a record about 1 to 3 lines down from the other selected record. A manual merge point should force the 2 selected records to match against each other.

Here is my version and setting info:
SourceGear DiffMerge : Version 3.1.0 (15888) : WXMSW {2.8.3}

Compiled features:
FEATURE_ADS
FEATURE_ADS_TOOLBAR
FEATURE_SHEX
FEATURE_BATCHOUTPUT

Command Line Arguments: [count 3]
argv[0]: C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe
argv[1]: C:\SnDev2005\SpaceNet\dev\SimSupport\SonOfSpre\Database\C2_Unknown_Sat\C2_Unknown_Sat.stab
argv[2]: C:\SnDev2005\SpaceNet\dev\SimSupport\SonOfSpre\Database\C2_Unknown_Sat\C2_Unknown_Sat_his.stab

Active Window Properties:
Window Title: C2_Unknown_Sat.stab, C2_Unknown_Sat_his.stab - SourceGear DiffMerge
Window Type: FileDiff
Edit State: Editable
DisplayOps[View]: 0x00000000
DisplayOps[Edit]: 0x00000000
Pilcrow: true
TabStop: 8
LineNumbers: true
Files Loaded:
Panel(Left):
Path: C:\SnDev2005\SpaceNet\dev\SimSupport\SonOfSpre\Database\C2_Unknown_Sat\C2_Unknown_Sat.stab
EOL Style: CRLF
Encoding: Default encoding (without BOM)
Stats: [0x00000000]
Panel(Right/View):
Path: C:\SnDev2005\SpaceNet\dev\SimSupport\SonOfSpre\Database\C2_Unknown_Sat\C2_Unknown_Sat_his.stab
EOL Style: CRLF
Encoding: Default encoding (without BOM)
Stats: [0x00000000]
Panel(Right/Edit):
Path: C:\SnDev2005\SpaceNet\dev\SimSupport\SonOfSpre\Database\C2_Unknown_Sat\___AAF5.tmp
EOL Style: CRLF
Encoding: Default encoding (without BOM)
Stats: [0x00000000]
RuleSet: _Default_
Analysis Reference View:
DisplayOps: 0x00000000
Analysis Stats: Changes: 267
Alignment Marks: [count 1]
Analysis Editing View:
DisplayOps: 0x00000000
Analysis Stats: Changes: 269
Alignment Marks: [count 4]

Ruleset Table: [Version 5]
Ruleset: _Default_
Suffixes: *
Line Match Handling: [0x00000010]
Ignore/Strip EOLs: true
Ignore/Fold Case: true
Strip Whitespace: true
Also Treat TABs as Whitespace: true
Default Context Guidelines: [0x0000000e]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: true
Whitespace differences are important: true
Treat TABs as Whitespace: N/A
Custom Contexts: [0 contexts]
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Use System Local/Default
Lines To Omit: [0 patterns]
Ruleset: C/C++/C# Source
Suffixes: c cpp cs h
Line Match Handling: [0x00000010]
Ignore/Strip EOLs: true
Ignore/Fold Case: true
Strip Whitespace: true
Also Treat TABs as Whitespace: true
Default Context Guidelines: [0x00000018]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: true
Whitespace differences are important: false
Treat TABs as Whitespace: true
Custom Contexts: [4 contexts]
Context[0]: Comment: /\* to \*/
Guidelines: [0x00000011]
Classify Differences as Important: false
EOL differences are important: N/A
Case differences are important: N/A
Whitespace differences are important: N/A
Treat TABs as Whitespace: N/A
Context[1]: Comment: // to EOL (Escape character \)
Guidelines: [0x00000011]
Classify Differences as Important: false
EOL differences are important: N/A
Case differences are important: N/A
Whitespace differences are important: N/A
Treat TABs as Whitespace: N/A
Context[2]: Literal: " to " or EOL (Escape character \)
Guidelines: [0x0000000e]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: true
Whitespace differences are important: true
Treat TABs as Whitespace: N/A
Context[3]: Literal: ' to ' or EOL (Escape character \)
Guidelines: [0x0000000e]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: true
Whitespace differences are important: true
Treat TABs as Whitespace: N/A
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Assume [Western European (ISO-8859-1)]
Lines To Omit: [0 patterns]
Ruleset: Visual Basic Source
Suffixes: bas frm cls vbp ctl vbs
Line Match Handling: [0x00000010]
Ignore/Strip EOLs: true
Ignore/Fold Case: true
Strip Whitespace: true
Also Treat TABs as Whitespace: true
Default Context Guidelines: [0x00000010]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: false
Whitespace differences are important: false
Treat TABs as Whitespace: true
Custom Contexts: [2 contexts]
Context[0]: Comment: ' to EOL
Guidelines: [0x00000011]
Classify Differences as Important: false
EOL differences are important: N/A
Case differences are important: N/A
Whitespace differences are important: N/A
Treat TABs as Whitespace: N/A
Context[1]: Literal: " to "
Guidelines: [0x0000000e]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: true
Whitespace differences are important: true
Treat TABs as Whitespace: N/A
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Assume [Western European (ISO-8859-1)]
Lines To Omit: [0 patterns]
Ruleset: Python Source
Suffixes: py
Line Match Handling: [0x00000010]
Ignore/Strip EOLs: true
Ignore/Fold Case: true
Strip Whitespace: true
Also Treat TABs as Whitespace: true
Default Context Guidelines: [0x0000000c]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: true
Whitespace differences are important: true
Treat TABs as Whitespace: N/A
Custom Contexts: [2 contexts]
Context[0]: Comment: # to EOL
Guidelines: [0x00000011]
Classify Differences as Important: false
EOL differences are important: N/A
Case differences are important: N/A
Whitespace differences are important: N/A
Treat TABs as Whitespace: N/A
Context[1]: Literal: " to "
Guidelines: [0x0000000e]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: true
Whitespace differences are important: true
Treat TABs as Whitespace: N/A
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Assume [Western European (ISO-8859-1)]
Lines To Omit: [0 patterns]
Ruleset: Java Source
Suffixes: java jav
Line Match Handling: [0x00000010]
Ignore/Strip EOLs: true
Ignore/Fold Case: true
Strip Whitespace: true
Also Treat TABs as Whitespace: true
Default Context Guidelines: [0x00000018]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: true
Whitespace differences are important: false
Treat TABs as Whitespace: true
Custom Contexts: [3 contexts]
Context[0]: Comment: /\* to \*/
Guidelines: [0x00000011]
Classify Differences as Important: false
EOL differences are important: N/A
Case differences are important: N/A
Whitespace differences are important: N/A
Treat TABs as Whitespace: N/A
Context[1]: Comment: // to EOL (Escape character \)
Guidelines: [0x00000011]
Classify Differences as Important: false
EOL differences are important: N/A
Case differences are important: N/A
Whitespace differences are important: N/A
Treat TABs as Whitespace: N/A
Context[2]: Literal: " to " or EOL (Escape character \)
Guidelines: [0x0000000e]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: true
Whitespace differences are important: true
Treat TABs as Whitespace: N/A
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Assume [Western European (ISO-8859-1)]
Lines To Omit: [0 patterns]
Ruleset: Text Files
Suffixes: txt text
Line Match Handling: [0x00000010]
Ignore/Strip EOLs: true
Ignore/Fold Case: true
Strip Whitespace: true
Also Treat TABs as Whitespace: true
Default Context Guidelines: [0x0000000e]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: true
Whitespace differences are important: true
Treat TABs as Whitespace: N/A
Custom Contexts: [0 contexts]
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Assume [Western European (ISO-8859-1)]
Lines To Omit: [0 patterns]
Ruleset: UTF-8 Text Files
Suffixes: utf utf8
Line Match Handling: [0x00000010]
Ignore/Strip EOLs: true
Ignore/Fold Case: true
Strip Whitespace: true
Also Treat TABs as Whitespace: true
Default Context Guidelines: [0x0000000e]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: true
Whitespace differences are important: true
Treat TABs as Whitespace: N/A
Custom Contexts: [0 contexts]
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Assume [Unicode 8 bit (UTF-8)]
Lines To Omit: [0 patterns]
Ruleset: XML Files
Suffixes: xml
Line Match Handling: [0x00000010]
Ignore/Strip EOLs: true
Ignore/Fold Case: true
Strip Whitespace: true
Also Treat TABs as Whitespace: true
Default Context Guidelines: [0x00000018]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: true
Whitespace differences are important: false
Treat TABs as Whitespace: true
Custom Contexts: [1 contexts]
Context[0]: Comment: <!-- to -->
Guidelines: [0x00000011]
Classify Differences as Important: false
EOL differences are important: N/A
Case differences are important: N/A
Whitespace differences are important: N/A
Treat TABs as Whitespace: N/A
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Assume [Unicode 8 bit (UTF-8)]
Lines To Omit: [0 patterns]

Global Properties: (current / default)
Folder/IgnoreSuffixFilter : 0 [0x00000000] / 0 [0x00000000]
Folder/IgnoreSubdirFilter : 0 [0x00000000] / 0 [0x00000000]
Folder/ShowEqual : 0 [0x00000000] / 0 [0x00000000]
Folder/ShowErrors : 1 [0x00000001] / 1 [0x00000001]
Folder/ShowFolders : 0 [0x00000000] / 0 [0x00000000]
Folder/ShowSingles : 0 [0x00000000] / 0 [0x00000000]
File/Ruleset/EnableCustomRulesets : 1 [0x00000001] / 1 [0x00000001]
File/Ruleset/EnableAutomaticMatch : 1 [0x00000001] / 1 [0x00000001]
File/Ruleset/IgnoreSuffixCase : 1 [0x00000001] / 1 [0x00000001]
File/Ruleset/RequireCompleteMatch : 0 [0x00000000] / 0 [0x00000000]
File/Ruleset/AskIfNoMatch : 0 [0x00000000] / 0 [0x00000000]
File/View/DontShowEquivalentMsg : 0 [0x00000000] / 0 [0x00000000]
File/View/DontShowAutoMergeConflictsMsg : 0 [0x00000000] / 0 [0x00000000]
Folder/View/DontShowSameFolderMsg : 0 [0x00000000] / 0 [0x00000000]
File/View/DontShowSameFilesMsg : 0 [0x00000000] / 0 [0x00000000]
File/View/DontShowExitMultipleWindowsMsg : 1 [0x00000001] / 1 [0x00000001]
File/Color/Window/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff]
File/Color/Omit/bg : 16316664 [0x00f8f8f8] / 16316664 [0x00f8f8f8]
File/Color/Omit/fg : 8421504 [0x00808080] / 8421504 [0x00808080]
File/Color/AllEqual/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff]
File/Color/AllEqual/fg : 0 [0x00000000] / 0 [0x00000000]
File/Color/AllEqual/Unimp/fg : 0 [0x00000000] / 0 [0x00000000]
File/Color/NoneEqual/bg : 16314608 [0x00f8f0f0] / 16314608 [0x00f8f0f0]
File/Color/NoneEqual/IL/bg : 16765640 [0x00ffd2c8] / 16765640 [0x00ffd2c8]
File/Color/NoneEqual/fg : 13762560 [0x00d20000] / 13762560 [0x00d20000]
File/Color/NoneEqual/Unimp/fg : 8866109 [0x0087493d] / 8866109 [0x0087493d]
File/Color/Conflict/bg : 16777168 [0x00ffffd0] / 16777168 [0x00ffffd0]
File/Color/Conflict/IL/bg : 16765640 [0x00ffd2c8] / 16765640 [0x00ffd2c8]
File/Color/Conflict/fg : 13762560 [0x00d20000] / 13762560 [0x00d20000]
File/Color/Conflict/Unimp/fg : 8866109 [0x0087493d] / 8866109 [0x0087493d]
File/Color/SubEqual/bg : 15792368 [0x00f0f8f0] / 15792368 [0x00f0f8f0]
File/Color/SubEqual/IL/bg : 12647104 [0x00c0fac0] / 12647104 [0x00c0fac0]
File/Color/SubEqual/fg : 32768 [0x00008000] / 32768 [0x00008000]
File/Color/SubNotEqual/bg : 15921919 [0x00f2f2ff] / 15921919 [0x00f2f2ff]
File/Color/SubNotEqual/IL/bg : 14408703 [0x00dbdbff] / 14408703 [0x00dbdbff]
File/Color/SubNotEqual/fg : 128 [0x00000080] / 128 [0x00000080]
File/Color/Sum/Unimp/fg : 6460808 [0x00629588] / 6460808 [0x00629588]
File/Color/EolUnknown/fg : 12632256 [0x00c0c0c0] / 12632256 [0x00c0c0c0]
File/Color/LineNr/fg : 6460808 [0x00629588] / 6460808 [0x00629588]
File/Color/LineNr/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff]
File/Color/Caret/fg : 0 [0x00000000] / 0 [0x00000000]
File/Color/Void/fg : 14540253 [0x00dddddd] / 14540253 [0x00dddddd]
File/Color/Void/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff]
File/Color/Selection/fg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff]
File/Color/Selection/bg : 255 [0x000000ff] / 255 [0x000000ff]
Folder/Color/Equal/fg : 0 [0x00000000] / 0 [0x00000000]
Folder/Color/Equal/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff]
Folder/Color/Different/fg : 13762560 [0x00d20000] / 13762560 [0x00d20000]
Folder/Color/Different/bg : 16314608 [0x00f8f0f0] / 16314608 [0x00f8f0f0]
Folder/Color/FileNull/fg : 200 [0x000000c8] / 200 [0x000000c8]
Folder/Color/FileNull/bg : 15921919 [0x00f2f2ff] / 15921919 [0x00f2f2ff]
Folder/Color/Error/fg : 16711680 [0x00ff0000] / 16711680 [0x00ff0000]
Folder/Color/Error/bg : 16777184 [0x00ffffe0] / 16777184 [0x00ffffe0]
Folder/Color/Folders/fg : 0 [0x00000000] / 0 [0x00000000]
Folder/Color/Folders/bg : 13882323 [0x00d3d3d3] / 13882323 [0x00d3d3d3]
Folder/Color/FolderNull/fg : 200 [0x000000c8] / 200 [0x000000c8]
Folder/Color/FolderNull/bg : 14277119 [0x00d9d9ff] / 14277119 [0x00d9d9ff]
Window/Size/Blank/w : 1564 [0x0000061c] / -1 [0xffffffff]
Window/Size/Blank/h : 896 [0x00000380] / -1 [0xffffffff]
Window/Size/Folder/w : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/Folder/h : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/Diff/w : 1564 [0x0000061c] / -1 [0xffffffff]
Window/Size/Diff/h : 896 [0x00000380] / -1 [0xffffffff]
Window/Size/Merge/w : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/Merge/h : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/PrintPreview/w : 1121 [0x00000461] / -1 [0xffffffff]
Window/Size/PrintPreview/h : 847 [0x0000034f] / -1 [0xffffffff]
Window/Size/Blank/x : 4 [0x00000004] / -1 [0xffffffff]
Window/Size/Blank/y : 154 [0x0000009a] / -1 [0xffffffff]
Window/Size/Folder/x : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/Folder/y : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/Diff/x : 4 [0x00000004] / -1 [0xffffffff]
Window/Size/Diff/y : 154 [0x0000009a] / -1 [0xffffffff]
Window/Size/Merge/x : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/Merge/y : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/PrintPreview/x : 0 [0x00000000] / -1 [0xffffffff]
Window/Size/PrintPreview/y : 0 [0x00000000] / -1 [0xffffffff]
Window/Size/Blank/maximized : 0 [0x00000000] / 0 [0x00000000]
Window/Size/Folder/maximized : 0 [0x00000000] / 0 [0x00000000]
Window/Size/Diff/maximized : 0 [0x00000000] / 0 [0x00000000]
Window/Size/Merge/maximized : 0 [0x00000000] / 0 [0x00000000]
File/Context/Goal : 3 [0x00000003] / 3 [0x00000003]
File/Context/IntraLineSmoothingThreshold : 4 [0x00000004] / 3 [0x00000003]
File/Context/LineSmoothingThreshold : 0 [0x00000000] / 0 [0x00000000]
File/Context/DetailLevel : 1 [0x00000001] / 1 [0x00000001]
File/View/DisplayOp : 0 [0x00000000] / 0 [0x00000000]
File/View/LineNumbers : 1 [0x00000001] / 1 [0x00000001]
File/View/Pilcrow : 1 [0x00000001] / 0 [0x00000000]
File/View/Tabstop : 8 [0x00000008] / 8 [0x00000008]
Options/Dialog/InitialPage : 0 [0x00000000] / 0 [0x00000000]
Ruleset/Dialog/InitialPage : 0 [0x00000000] / 0 [0x00000000]
Dialog/Find/ICase : 1 [0x00000001] / 1 [0x00000001]
Dialog/Find/Wrap : 0 [0x00000000] / 0 [0x00000000]
Dialog/Find/RegEx : 0 [0x00000000] / 0 [0x00000000]
Dialog/Find/DontShowEofMsg : 0 [0x00000000] / 0 [0x00000000]
PageSetup/MarginTop : 10 [0x0000000a] / 10 [0x0000000a]
PageSetup/MarginLeft : 10 [0x0000000a] / 10 [0x0000000a]
PageSetup/MarginBottom : 10 [0x0000000a] / 10 [0x0000000a]
PageSetup/MarginRight : 10 [0x0000000a] / 10 [0x0000000a]
PrintData/Bin : 0 [0x00000000] / 0 [0x00000000]
PrintData/Collate : 0 [0x00000000] / 0 [0x00000000]
PrintData/Color : 1 [0x00000001] / 1 [0x00000001]
PrintData/Duplex : 0 [0x00000000] / 0 [0x00000000]
PrintData/Orientation : 1 [0x00000001] / 1 [0x00000001]
PrintData/PaperId : 1 [0x00000001] / 1 [0x00000001]
PrintData/Quality : -1 [0xffffffff] / -1 [0xffffffff]
Misc/Print/Across : 1 [0x00000001] / 1 [0x00000001]
Misc/RequireFinalEOL : 1 [0x00000001] / 1 [0x00000001]
Misc/AutoSaveInterval : 100 [0x00000064] / 100 [0x00000064]
Misc/CheckFilesOnActivate : 1 [0x00000001] / 1 [0x00000001]
Misc/CheckFoldersOnActivate : 0 [0x00000000] / 0 [0x00000000]
Misc/AutoAdvanceAfterApply : 1 [0x00000001] / 1 [0x00000001]
ShellExtension/Enabled : 1 [0x00000001] / 1 [0x00000001]
Folder/SuffixFilter :
cur: a aps bsc cab dll exe exp id idb ilk lib map mdp ncb o obj ocx out pch pdb res sbr so vcp
def: a aps bsc cab dll exe exp id idb ilk lib map mdp ncb o obj ocx out pch pdb res sbr so vcp
Folder/SubdirFilter :
cur: Debug Release _sgbak _sgvault objs
def: Debug Release _sgbak _sgvault objs
Dialog/Choose/Folder/Seed/Left :
cur:
def:
Dialog/Choose/Folder/Seed/Right :
cur:
def:
Dialog/Choose/File/Diff/Seed/0 :
cur: C:\SnDev2005\SpaceNet\dev\SimSupport\SonOfSpre\Database\EO_GEO_Tracking\EO_GEO_Tracking.stab
def:
Dialog/Choose/File/Diff/Seed/1 :
cur: C:\Documents and Settings\mysimjlb\Local Settings\Temp\sna05304\EO_GEO_Tracking_his.stab
def:
Dialog/Choose/File/Merge/Seed/0 :
cur:
def:
Dialog/Choose/File/Merge/Seed/1 :
cur:
def:
Dialog/Choose/File/Merge/Seed/2 :
cur:
def:
Dialog/Find/Patern/Text :
cur: estimated orb
def:
File/Font :
cur: 7:74:Courier New
def: 10::
Folder/Font :
cur: 8:74:Courier New
def: 10::
File/Printer/Font :
cur: 8:74:Courier New
def: 10::
Folder/Printer/Font :
cur: 7:74:Courier New
def: 10::
File/Ruleset/Serialized :
cur:
004205024cffffffff0353090000005f44656661
756c745f0453010000002a054200064c00000000
154201124c0e000000134c10000000144cffffff
ff024c0000000003530f000000432f432b2b2f43
2320536f7572636504530a000000632063707020
63732068054203064c010000001542010b4c0000
00000c4c110000000d53030000002f5c2a0e5303
0000005c2a2f0f4200104200114c000000000b4c
010000000c4c110000000d53020000002f2f0e53
000000000f425c104201114c010000000b4c0200
00000c4c0e0000000d5301000000220e53010000
00220f425c104201114c020000000b4c03000000
0c4c0e0000000d5301000000270e530100000027
0f425c104201114c03000000124c18000000134c
10000000144c00000000024c0100000003531300
000056697375616c20426173696320536f757263
650453170000006261732066726d20636c732076
62702063746c20766273054203064c0100000015
42010b4c000000000c4c110000000d5301000000
270e53000000000f4200104201114c000000000b
4c010000000c4c0e0000000d5301000000220e53
01000000220f4200104200114c01000000124c10
000000134c10000000144c01000000024c020000
0003530d000000507974686f6e20536f75726365
0453020000007079054203064c01000000154201
0b4c000000000c4c110000000d5301000000230e
53000000000f4200104201114c000000000b4c01
0000000c4c0e0000000d5301000000220e530100
0000220f4200104200114c01000000124c0c0000
00134c10000000144c02000000024c0300000003
530b0000004a61766120536f7572636504530800
00006a617661206a6176054203064c0100000015
42010b4c000000000c4c110000000d5303000000
2f5c2a0e53030000005c2a2f0f4200104200114c
000000000b4c010000000c4c110000000d530200
00002f2f0e53000000000f425c104201114c0100
00000b4c020000000c4c0e0000000d5301000000
220e5301000000220f425c104201114c02000000
124c18000000134c10000000144c03000000024c
0400000003530a000000546578742046696c6573
0453080000007478742074657874054203064c01
000000154201124c0e000000134c10000000144c
04000000024c050000000353100000005554462d
3820546578742046696c65730453080000007574
662075746638054203064c29000000154201124c
0e000000134c10000000144c05000000024c0600
0000035309000000584d4c2046696c6573045303
000000786d6c054203064c290000001542010b4c
000000000c4c110000000d53040000003c212d2d
0e53030000002d2d3e0f4200104200114c000000
00124c18000000134c10000000144c0600000001
4205
def:
Dialog/Color/CustomColors :
cur: ffffff:ffffff:ffffff:ffffff:ffffff:ffffff:ffffff:ffffff:ffffff:ffffff:ffffff:ffffff:ffffff:ffffff:ffffff:ffffff:
def:
PrintData/PrinterName :
cur:
def:
ShellExtension/CLARGS :
cur: /nosplash /shex
def: /nosplash /shex

All Windows:
Window Title: C2_Unknown_Sat.stab, C2_Unknown_Sat_his.stab - SourceGear DiffMerge
Window Type: FileDiff
Edit State: Editable
DisplayOps[View]: 0x00000000
DisplayOps[Edit]: 0x00000000
Pilcrow: true
TabStop: 8
LineNumbers: true
Files Loaded:
Panel(Left):
Path: C:\SnDev2005\SpaceNet\dev\SimSupport\SonOfSpre\Database\C2_Unknown_Sat\C2_Unknown_Sat.stab
EOL Style: CRLF
Encoding: Default encoding (without BOM)
Stats: [0x00000000]
Panel(Right/View):
Path: C:\SnDev2005\SpaceNet\dev\SimSupport\SonOfSpre\Database\C2_Unknown_Sat\C2_Unknown_Sat_his.stab
EOL Style: CRLF
Encoding: Default encoding (without BOM)
Stats: [0x00000000]
Panel(Right/Edit):
Path: C:\SnDev2005\SpaceNet\dev\SimSupport\SonOfSpre\Database\C2_Unknown_Sat\___AAF5.tmp
EOL Style: CRLF
Encoding: Default encoding (without BOM)
Stats: [0x00000000]
RuleSet: _Default_
Analysis Reference View:
DisplayOps: 0x00000000
Analysis Stats: Changes: 267
Alignment Marks: [count 1]
Analysis Editing View:
DisplayOps: 0x00000000
Analysis Stats: Changes: 269
Alignment Marks: [count 4]
- Jim B

Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
PostPosted: Wed Apr 09, 2008 1:50 pm
I'm sorry that alignment markers are causing you such problems.
I wasn't happy with the feature when I shipped it, but I didn't have
time to improve it further.

I'll log a feature request with your "apply" suggestion.

WRT it being sluggish on each insert, you might try setting the
detail level to "lines only" on the "Detail Level" page of the Options
dialog. This might speed things up for you.

WRT problem #2, the marker is a boundary that starts a new
sub-diff. It doesn't force the first lines following the marker to
line up. But rather, it starts the beginning of a new diff and there
can be inserted and deleted lines at the beginning of the sub-diff
just like there can be ones at the top of the file. so the behavior
that you're seeing is "correct". setting the detail level may
improve this and it may more closely match what you're expecting.

hope this helps (and sorry for the problems),
jeff

Posts: 8
Joined: Wed Apr 09, 2008 9:35 am
Location: CA, USA
PostPosted: Thu Apr 10, 2008 2:07 pm
Jeff,
Would it be possible to log a feature request that a checkbox be added to the Manual Alignment marker screen (and a corresponding display column in the list of markers already added) to specify that a manual alignment is a matching line, rather than simply a start of a new diff It could default to the current behaviour, thus preserving compatibility. Potential text for the checkbox could be MATCH THIS LINE PAIR

Thanks, Jim
- Jim B

Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
PostPosted: Thu Apr 10, 2008 2:51 pm
I'll add a request as you suggested.

thanks
jeff

Return to Support (DiffMerge)

Who is online

Users browsing this forum: No registered users and 3 guests

cron