You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Before being compared two files they must be aligned, the alignment rule can be configured
12
12
13
-
# Align by name case sensitivity
13
+
# Align by Name Case Sensitivity
14
14
15
15
The default alignment method compares file name strings, if they are match case then they will be aligned.
16
16
Suppose you have the scenario shown below
@@ -54,7 +54,7 @@ This can be achieved selecting 'Ignore File Name Case' from popup menu.</p>
54
54
</tr>
55
55
</table>
56
56
57
-
# Align by HFS+ filesystem case
57
+
# Align by HFS+ Filesystem Case
58
58
59
59
Normally the <acronymtitle="Hierarchical File System">HFS+</acronym> disks are formatted ignoring the file name case, so if we have winter.jpg and WINTER.JPG they cannot be created on same directory (because they have the same name).
60
60
@@ -68,7 +68,7 @@ It is possible to let VisualDiffer determine the file name alignment case algori
68
68
69
69
If the last scenario is true, the alignment will try to be smart, first it searches if a match case is available (winter.jpg with winter.jpg) then it tries to align with the most similar name.
70
70
71
-
# Align by user defined rules (not available on OSX 10.6 Snow Leopard)
71
+
# Align by User Defined Rules (required OSX Lion or above)
72
72
73
73
There are scenarios where it is necessary to align files having different names.
74
74
@@ -115,15 +115,15 @@ Suppose you want to align ignoring the file extension to produce the result show
115
115
116
116
This can be achieved using VisualDiffer 'user defined alignment rules'.
117
117
118
-
## Managing alignment rules
118
+
## Managing Alignment Rules
119
119
120
120
You can create, edit or delte rules from Session Preferences Dialog
More rules can be assigned to a VisualDiffer session comparison, they are evaluated from top to bottom.
125
125
126
-
## Creating a rule
126
+
## Creating a Rule
127
127
128
128
When you add a new rule (or edit an existing one) you access to the dialog shown below
129
129
@@ -136,11 +136,11 @@ A rule has
136
136
137
137
_If you are not familiar with regular expressions please refer to [ICU](http://userguide.icu-project.org/strings/regexp) documentation._
138
138
139
-
## Left regular expression
139
+
## Left Regular Expression
140
140
141
141
The left regexp is used to match a filename on the left side of VisualDiffer Folder View, we want to find all jpg files so we create a group `(.*)` followed by `.jpg` extension.
142
142
143
-
## Right pattern expression
143
+
## Right Pattern Expression
144
144
145
145
Notice the right expression **isn't** a regular expression, it should contain some special patterns used to access to regular expression groups (if any).
146
146
@@ -173,4 +173,5 @@ But `002.jpg` and `002.RAW` files are not aligned because `002.RAW` extension is
It is possible to verify immediately if the expressions work as expected using the 'Test Rule', just type a file name and the 'Result' field will be filled accordingly.
Copy file name to clipboardExpand all lines: comparisonMethods.md
+8-8Lines changed: 8 additions & 8 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -4,11 +4,11 @@ layout: default
4
4
5
5
# mainAnchor is used by Apple links
6
6
mainAnchor: comparisonMethod
7
-
title: Comparison method
8
-
subtitle: Choose the method to compare folders and how to handle special files and metadata
7
+
title: Comparison Method
8
+
subtitle: The folders comparison method, special files and metadata
9
9
---
10
10
11
-
# Comparison method
11
+
# Comparison Method
12
12
13
13
It is possible to choose which method to use to compare two folders.
14
14
The method to use is strictly related to user needs, comparing source code (files large only few kilobytes) should use a content comparison but to find which movies (files larger than a gigabytes) are not present on right side is faster compare by file size or file timestamp.
@@ -59,7 +59,7 @@ The complete list of supported comparison methods
59
59
</table>
60
60
61
61
62
-
# Compare Finder metadata
62
+
# Compare Finder Metadata
63
63
64
64
It is possible to compare OSX Finder Metadata.
65
65
@@ -84,7 +84,7 @@ The complete list of supported metadata
84
84
</table>
85
85
86
86
87
-
# Special files handling
87
+
# Special Files Handling
88
88
89
89
User can choose to not traverse special files like symbolic links and packages
90
90
@@ -105,7 +105,7 @@ User can choose to not traverse special files like symbolic links and packages
105
105
</table>
106
106
107
107
108
-
# Timestamp tolerance
108
+
# Timestamp Tolerance
109
109
110
110
The timestamp comparison considers two files matching when the time (including the seconds) is identical but sometime it would be useful to have a range of tolerance for example when the difference is between 5 seconds.
111
111
@@ -114,9 +114,9 @@ You can set this tolerance entering a positive integer number into the text fiel
114
114
Ignore differences of X seconds or less
115
115
116
116
117
-
# File to show
117
+
# Choose Files to View according to differences found
118
118
119
-
After the comparison complete you can determine which files to show
119
+
After the comparison complete you can choose which files to view
120
120
121
121
Definition: **Orphan** indicates a file present only on one side
Copy file name to clipboardExpand all lines: trustedPaths.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -25,7 +25,7 @@ Applications like Dreamweaver save to temporary file the remote version and then
25
25
26
26
This behaviour generates a very frustrating user experience because the user must select the file from the panel again and again.
27
27
28
-
Use trusted paths
28
+
Use Trusted Paths
29
29
=================
30
30
31
31
Trusted paths resolve this problem, applications save files always on their own specific temporary folders, for example SourceTree can generate the following path
@@ -38,7 +38,7 @@ We can trust **/var/folders** that is the root used by SourceTree to saves tempo
38
38
39
39
Trusting **/var/folders** ensures every path generated inside it (at any deeper subfolder level) doesn't require any additional user permission and the file panel prompts no longer appears
40
40
41
-
Where configure trusted paths
41
+
Where configure Trusted Paths
42
42
=============================
43
43
44
44
You can add and removed trusted paths from VisualDiffer Preference panel
0 commit comments