file compare

Syntax

Release Information

Command introduced before JUNOS Release 7.4.

Description

Compare two local files and describe the differences between them in default, context, or unified output styles:

• Default—In the first line of output, c means lines were changed between the two files, d means lines were deleted between the two files, and a means lines were added between the two files. The numbers preceding this alphabetical marker represent the first file, and the lines after the alphabetical marker represent the second file. A left angle bracket (<) in front of output lines refers to the first file. A right angle bracket (>) in front of output lines refers to the second file.
• Context—Display is divided into two parts. The first part is the first file; the second part is the second file. Output lines preceded by an exclamation point (!) have changed. Additions are marked with a plus sign (+), and deletions are marked with a minus sign (-).
• Unified—Display is preceded by the line number from the first and the second file (xx,xxx,x). Before the line number, additions to the file are marked with a plus sign (+), and deletions to the file are marked with a minus sign (-). The body of the output contains the affected lines. Changes are viewed as additions plus deletions.

Options

files filename — Names of two local files to compare.

context — (Optional) Display output in context format.

ignore-white-space — (Optional) Ignore changes in amount of white space.

unified — (Optional) Display output in unified format.

Required Privilege Level

none

List of Sample Output

Output Fields

When you enter this command, you are provided feedback on the status of your request.

Sample Output

100c100
<             full-name "File 1";
---
>             full-name "File 2";
102c102
<             class foo; # 'foo' is not defined
---
>             class super-user;

*** /tmp/one    Wed Dec  3 17:12:50 2003
--- /tmp/two    Wed Dec  3 09:13:14 2003
***************
*** 97,104 ****
              }
          }
          user bill {
!             full-name "Bill Smith";
!             class foo; # 'foo' is not defined
              authentication {
                  encrypted-password SECRET;
              }
--- 97,105 ----
              }
          }
          user bill {
!             full-name "Bill Smith";
!             uid 1089;
!             class super-user;
              authentication {
                  encrypted-password SECRET;
              }     

--- /tmp/one    Wed Dec  3 17:12:50 2003
+++ /tmp/two    Wed Dec  3 09:13:14 2003
@@ -97,8 +97,9 @@
             }
         }
         user bill {
-            full-name "Bill Smith";
-            class foo; # 'foo' is not defined
+            full-name "Bill Smith";
+            uid 1089;
+            class super-user;
             authentication {
                 encrypted-passwordSECRET;
             }

--- /tmp/one    Wed Dec  3 09:13:10 2003
+++ /tmp/two    Wed Dec  3 09:13:14 2003
@@ -99,7 +99,7 @@
         user bill {
             full-name "Bill Smith";
             uid 1089;
-            class foo; # 'foo' is not defined
+            class super-user;
             authentication {
                  encrypted-password <SECRET>; # SECRET-DATA
             }