Can DiffMerge ignore symbolic links?

Support for our DiffMerge utility.

Moderator: SourceGear

Post Reply
dvclaus
Posts: 1
Joined: Wed Oct 16, 2019 2:17 pm

Can DiffMerge ignore symbolic links?

Post by dvclaus » Wed Oct 16, 2019 2:33 pm

Hello,

I'm using git-tower.com's Git Client to compare folders. When I do this, Tower creates one folder with the actual files, and the other folder ends up being a symlink to the original files.

Even though the file and path names are the same, the folder diff ends up showing them all as "peerless" like so because of the symlink.

Here's how this looks in the diffMerge UI:

Code: Select all

+-  src/main/foo.txt                                          
+-                                          src/main/foo.txt@
(sorry for the ASCII art)

This is what they look like in the file system. The first one is a normal file:

Code: Select all

$ ls -l ./left/src/main/foo.txt
lrwxr-xr-x  1 username  username  99 Oct 16 15:02 ./left/src/main/foo.txt
The second one is a sym link to a different location:

Code: Select all

$ ls -l ./right/src/main/foo.txt
lrwxr-xr-x  1 username  username  99 Oct 16 15:02 ./right/src/main/foo.txt -> /tmp/foo/src/main/foo.txt
Is there some way to have DiffMerge recognize these as being the same file even though one is symlinked and the other isn't?

-Dave


Operating System: MacOS Mojave (10.14.6)
--------------------

Support Info:
----------------

SourceGear DiffMerge : Version 4.2.1 (1013:503b78a659) [intel] stable : WXMAC {3.0.2}

[P mac.intel][V 04.02.01.01013]

Machine: ll=8 l=8 i=4 v*=8 s=8 c=4

Compiled features:
FEATURE_BATCHOUTPUT

Command Line Arguments:
[0]: /Applications/DiffMerge.app/Contents/MacOS/DiffMerge
[1]: -nosplash
[2]: -t1=Ours
[3]: -t2=Theirs
[4]: /var/folders/_8/dcfxdy817pv5nh1_pd8dg5700000gr/T//git-difftool.bIoiJY/left/
[5]: /var/folders/_8/dcfxdy817pv5nh1_pd8dg5700000gr/T//git-difftool.bIoiJY/right/

Active Window Properties:
Window Title: .../left, .../right - SourceGear DiffMerge
Window Type: Folder
Path[0]: /var/folders/_8/dcfxdy817pv5nh1_pd8dg5700000gr/T/git-difftool.bIoiJY/left/
Path[1]: /var/folders/_8/dcfxdy817pv5nh1_pd8dg5700000gr/T/git-difftool.bIoiJY/right/
Stats: Files(0+0eq+0qm 0neq 5np) Folders(13p 0np) Symlinks(0eq 0neq 5np)

Ruleset Table: [Version 7]
Ruleset: _Default_
Suffixes: *
Line Match Handling: [0x00000010]
Ignore/Strip EOLs: true
Ignore/Fold Case: true
Strip Whitespace: true
Also Treat TABs as Whitespace: true
Folder Diff Ruleset Equivalence: [0x00000018]
Ignore/Strip EOLs: true
Ignore/Fold Case: false
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
Folder Diff Ruleset Equivalence: [0x00000018]
Ignore/Strip EOLs: true
Ignore/Fold Case: false
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
Folder Diff Ruleset Equivalence: [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
Folder Diff Ruleset Equivalence: [0x00000018]
Ignore/Strip EOLs: true
Ignore/Fold Case: false
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
Folder Diff Ruleset Equivalence: [0x00000018]
Ignore/Strip EOLs: true
Ignore/Fold Case: false
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
Folder Diff Ruleset Equivalence: [0x00000018]
Ignore/Strip EOLs: true
Ignore/Fold Case: false
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
Folder Diff Ruleset Equivalence: [0x00000018]
Ignore/Strip EOLs: true
Ignore/Fold Case: false
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
Folder Diff Ruleset Equivalence: [0x00000018]
Ignore/Strip EOLs: true
Ignore/Fold Case: false
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]

External Tools Table: [Version 1]

Global Properties: (current / default)
Folder/IgnoreSuffixFilter : 0 [0x00000000] / 0 [0x00000000]
Folder/IgnoreSubdirFilter : 0 [0x00000000] / 0 [0x00000000]
Folder/IgnoreFullFilenameFilter : 0 [0x00000000] / 0 [0x00000000]
Folder/IgnorePatternCase : 1 [0x00000001] / 1 [0x00000001]
Folder/IgnoreMatchupCase : 1 [0x00000001] / 1 [0x00000001]
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]
Folder/ShowFlags : 23 [0x00000017] / -1 [0xffffffff]
Folder/ShowEqual : -1 [0xffffffff] / -1 [0xffffffff]
Folder/ShowEquivalent : -1 [0xffffffff] / -1 [0xffffffff]
Folder/ShowSingles : -1 [0xffffffff] / -1 [0xffffffff]
Folder/ShowFolders : -1 [0xffffffff] / -1 [0xffffffff]
Folder/ShowErrors : -1 [0xffffffff] / -1 [0xffffffff]
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/Different/fg : 13762560 [0x00d20000] / 13762560 [0x00d20000]
Folder/Color/Different/bg : 16314608 [0x00f8f0f0] / 16314608 [0x00f8f0f0]
Folder/Color/Equal/fg : 0 [0x00000000] / 0 [0x00000000]
Folder/Color/Equal/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff]
Folder/Color/Equivalent/fg : 8421504 [0x00808080] / 8421504 [0x00808080]
Folder/Color/Equivalent/bg : 16316664 [0x00f8f8f8] / 16316664 [0x00f8f8f8]
Folder/Color/Folders/fg : 0 [0x00000000] / 0 [0x00000000]
Folder/Color/Folders/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff]
Folder/Color/Peerless/fg : 200 [0x000000c8] / 200 [0x000000c8]
Folder/Color/Peerless/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff]
Folder/Color/Error/fg : 16711680 [0x00ff0000] / 16711680 [0x00ff0000]
Folder/Color/Error/bg : 16777184 [0x00ffffe0] / 16777184 [0x00ffffe0]
Window/Size/Blank/w : 1518 [0x000005ee] / -1 [0xffffffff]
Window/Size/Blank/h : 634 [0x0000027a] / -1 [0xffffffff]
Window/Size/Folder/w : 1518 [0x000005ee] / -1 [0xffffffff]
Window/Size/Folder/h : 634 [0x0000027a] / -1 [0xffffffff]
Window/Size/Diff/w : 1569 [0x00000621] / -1 [0xffffffff]
Window/Size/Diff/h : 921 [0x00000399] / -1 [0xffffffff]
Window/Size/Merge/w : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/Merge/h : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/PrintPreview/w : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/PrintPreview/h : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/Blank/x : 2042 [0x000007fa] / -1 [0xffffffff]
Window/Size/Blank/y : 235 [0x000000eb] / -1 [0xffffffff]
Window/Size/Folder/x : 2042 [0x000007fa] / -1 [0xffffffff]
Window/Size/Folder/y : 235 [0x000000eb] / -1 [0xffffffff]
Window/Size/Diff/x : 2048 [0x00000800] / -1 [0xffffffff]
Window/Size/Diff/y : 102 [0x00000066] / -1 [0xffffffff]
Window/Size/Merge/x : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/Merge/y : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/PrintPreview/x : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/PrintPreview/y : -1 [0xffffffff] / -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 : 3 [0x00000003] / 3 [0x00000003]
File/Context/LineSmoothingThreshold : 0 [0x00000000] / 0 [0x00000000]
File/Context/DetailLevel : 1 [0x00000001] / 1 [0x00000001]
File/Context/MultiLineDetailLevel : 1 [0x00000001] / 1 [0x00000001]
File/Context/MultiLineDetailLimit : 40 [0x00000028] / 40 [0x00000028]
File/View/DisplayOp : 0 [0x00000000] / 0 [0x00000000]
File/View/LineNumbers : 1 [0x00000001] / 1 [0x00000001]
File/View/Pilcrow : 0 [0x00000000] / 0 [0x00000000]
File/View/Tabstop : 8 [0x00000008] / 8 [0x00000008]
File/View/Diff/ViewSplitterOrientation : 1 [0x00000001] / 1 [0x00000001]
File/View/Diff/EditSplitterOrientation : 1 [0x00000001] / 1 [0x00000001]
File/View/Merge/ViewSplitterOrientation : 1 [0x00000001] / 1 [0x00000001]
File/View/Merge/EditSplitterOrientation : 1 [0x00000001] / 1 [0x00000001]
Options/Dialog/InitialPage : 11 [0x0000000b] / 0 [0x00000000]
Ruleset/Dialog/InitialPage : 5 [0x00000005] / 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/Copies : 1 [0x00000001] / 1 [0x00000001]
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]
ExternalTools/IgnoreSuffixCase : 1 [0x00000001] / 1 [0x00000001]
ExternalTools/EnableTools : 0 [0x00000000] / 0 [0x00000000]
ExternalTools/RequireCompleteMatch : 0 [0x00000000] / 0 [0x00000000]
ExternalTools/DontShowExecMsg : 0 [0x00000000] / 0 [0x00000000]
ExternalTools/DlgInitialPage : 0 [0x00000000] / 0 [0x00000000]
License/Check : 1571255552 [0x5da77500] / 0 [0x00000000]
Revision/Check : 1571092629 [0x5da4f895] / 0 [0x00000000]
Folder/SoftMatch/Mode : 2 [0x00000002] / 2 [0x00000002]
Folder/SoftMatch/SimpleIgnoreEOL : 1 [0x00000001] / 1 [0x00000001]
Folder/SoftMatch/SimpleIgnoreWhitespace : 1 [0x00000001] / 1 [0x00000001]
Folder/SoftMatch/SimpleIgnoreTAB : 1 [0x00000001] / 1 [0x00000001]
Folder/SoftMatch/RulesetFileLimitMb : 1 [0x00000001] / 1 [0x00000001]
Folder/SoftMatch/RulesetAllowDefault : 0 [0x00000000] / 0 [0x00000000]
Folder/QuickMatch/Enabled : 0 [0x00000000] / 0 [0x00000000]
Folder/SuffixFilter :
cur: a aps bsc bz2 cab chm dll dmg exe exp id idb ilk iso lib map mdp msi ncb nvram o obj ocx out pch pdb res sbr so tar tgz vcp vmdk vmem vmsd vmss zip
def: a aps bsc bz2 cab chm dll dmg exe exp id idb ilk iso lib map mdp msi ncb nvram o obj ocx out pch pdb res sbr so tar tgz vcp vmdk vmem vmsd vmss zip
Folder/SubdirFilter :
cur: Debug Release _sgbak _sgvault objs .svn .git .bzr .hg .sgdrawer .sgcloset
def: Debug Release _sgbak _sgvault objs .svn .git .bzr .hg .sgdrawer .sgcloset
Folder/FullFilenameFilter :
cur: .DS_Store core *~ .#*
def: .DS_Store core *~ .#*
Dialog/Choose/Folder/Seed/Left :
cur:
def:
Dialog/Choose/Folder/Seed/Right :
cur:
def:
Dialog/Choose/File/Diff/Seed/0 :
cur: /Users/dclaussen/.aws/config
def:
Dialog/Choose/File/Diff/Seed/1 :
cur: /private/tmp/hunter_cred
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/Choose/Folder/Seed/SaveAs :
cur:
def:
Dialog/Choose/File/Diff/Seed/Export :
cur:
def:
File/Font :
cur: 12:76:Courier
def: 10::
Folder/Font :
cur: 10::
def: 10::
File/Printer/Font :
cur: 12:76:Courier
def: 10::
Folder/Printer/Font :
cur: 10::
def: 10::
File/Ruleset/Serialized :
cur:
004207024cffffffff0353090000005f44656661
756c745f0453010000002a054200064c00000000
174c00000000184c00000000154201124c0e0000
00134c10000000164c18000000144cffffffff02
4c0000000003530f000000432f432b2b2f432320
536f7572636504530a0000006320637070206373
2068054203064c01000000174c01000000184c01
0000001542010b4c000000000c4c110000000d53
030000002f5c2a0e53030000005c2a2f0f420010
4200114c000000000b4c010000000c4c11000000
0d53020000002f2f0e53000000000f425c104201
114c010000000b4c020000000c4c0e0000000d53
01000000220e5301000000220f425c104201114c
020000000b4c030000000c4c0e0000000d530100
0000270e5301000000270f425c104201114c0300
0000124c18000000134c10000000164c18000000
144c00000000024c010000000353130000005669
7375616c20426173696320536f75726365045317
0000006261732066726d20636c73207662702063
746c20766273054203064c01000000174c010000
00184c010000001542010b4c000000000c4c1100
00000d5301000000270e53000000000f42001042
01114c000000000b4c010000000c4c0e0000000d
5301000000220e5301000000220f420010420011
4c01000000124c10000000134c10000000164c10
000000144c01000000024c0200000003530d0000
00507974686f6e20536f75726365045302000000
7079054203064c01000000174c01000000184c01
0000001542010b4c000000000c4c110000000d53
01000000230e53000000000f4200104201114c00
0000000b4c010000000c4c0e0000000d53010000
00220e5301000000220f4200104200114c010000
00124c0c000000134c10000000164c1800000014
4c02000000024c0300000003530b0000004a6176
6120536f757263650453080000006a617661206a
6176054203064c01000000174c01000000184c01
0000001542010b4c000000000c4c110000000d53
030000002f5c2a0e53030000005c2a2f0f420010
4200114c000000000b4c010000000c4c11000000
0d53020000002f2f0e53000000000f425c104201
114c010000000b4c020000000c4c0e0000000d53
01000000220e5301000000220f425c104201114c
02000000124c18000000134c10000000164c1800
0000144c03000000024c0400000003530a000000
546578742046696c657304530800000074787420
74657874054203064c01000000174c0100000018
4c01000000154201124c0e000000134c10000000
164c18000000144c04000000024c050000000353
100000005554462d3820546578742046696c6573
0453080000007574662075746638054203064c2b
000000174c2b000000184c2b000000154201124c
0e000000134c10000000164c18000000144c0500
0000024c06000000035309000000584d4c204669
6c6573045303000000786d6c054203064c2b0000
00174c2b000000184c2b0000001542010b4c0000
00000c4c110000000d53040000003c212d2d0e53
030000002d2d3e0f4200104200114c0000000012
4c18000000134c10000000164c18000000144c06
000000014207
def:
Dialog/Color/CustomColors :
cur:
def:
PrintData/PrinterName :
cur:
def:
ExternalTools/Serialized :
cur: 004201014201
def:
License/Key :
cur: __omitted__
DPF :
cur:
def:
Folder/SoftMatch/SimpleSuffixes :
cur: c cpp cs h bas frm cls vbp ctl vbs java jav txt
def: c cpp cs h bas frm cls vbp ctl vbs java jav txt
Folder/QuickMatch/Suffixes :
cur: m4a m4p mov mp3 wav
def: m4a m4p mov mp3 wav

All Windows:
Window Title: .../left, .../right - SourceGear DiffMerge
Window Type: Folder
Path[0]: /var/folders/_8/dcfxdy817pv5nh1_pd8dg5700000gr/T/git-difftool.bIoiJY/left/
Path[1]: /var/folders/_8/dcfxdy817pv5nh1_pd8dg5700000gr/T/git-difftool.bIoiJY/right/
Stats: Files(0+0eq+0qm 0neq 5np) Folders(13p 0np) Symlinks(0eq 0neq 5np)

Tonya
Posts: 520
Joined: Thu Jan 20, 2005 1:47 pm
Location: SourceGear

Re: Can DiffMerge ignore symbolic links?

Post by Tonya » Thu Oct 17, 2019 9:48 am

Hi Dave,

Thank you for all the details you provided us with.

Is there some way to have DiffMerge recognize these as being the same file even though one is symlinked and the other isn't?

Unfortunately, no. This option is not supported but I will log it as a feature request to be considered in a future release.

Thanks,

Tonya

Post Reply