|
@@ -1,6 +1,6 @@
|
|
|
.\" Man page generated from reStructuredText.
|
|
|
.
|
|
|
-.TH BORG-DIFF 1 "2020-12-24" "" "borg backup tool"
|
|
|
+.TH BORG-DIFF 1 "2021-03-22" "" "borg backup tool"
|
|
|
.SH NAME
|
|
|
borg-diff \- Diff contents of two archives
|
|
|
.
|
|
@@ -77,6 +77,9 @@ Override check of chunker parameters.
|
|
|
.TP
|
|
|
.B \-\-sort
|
|
|
Sort the output lines by file path.
|
|
|
+.TP
|
|
|
+.B \-\-json\-lines
|
|
|
+Format output as JSON Lines.
|
|
|
.UNINDENT
|
|
|
.SS Exclusion options
|
|
|
.INDENT 0.0
|
|
@@ -111,6 +114,7 @@ $ chmod a+x file1
|
|
|
$ echo "something" >> file2
|
|
|
$ borg create ../testrepo::archive2 .
|
|
|
|
|
|
+$ echo "testing 123" >> file1
|
|
|
$ rm file3
|
|
|
$ touch file4
|
|
|
$ borg create ../testrepo::archive3 .
|
|
@@ -121,14 +125,21 @@ $ borg diff testrepo::archive1 archive2
|
|
|
+135 B \-252 B file2
|
|
|
|
|
|
$ borg diff testrepo::archive2 archive3
|
|
|
+ +17 B \-5 B file1
|
|
|
added 0 B file4
|
|
|
removed 0 B file3
|
|
|
|
|
|
$ borg diff testrepo::archive1 archive3
|
|
|
-[\-rw\-r\-\-r\-\- \-> \-rwxr\-xr\-x] file1
|
|
|
+ +17 B \-5 B [\-rw\-r\-\-r\-\- \-> \-rwxr\-xr\-x] file1
|
|
|
+135 B \-252 B file2
|
|
|
added 0 B file4
|
|
|
removed 0 B file3
|
|
|
+
|
|
|
+$ borg diff \-\-json\-lines testrepo::archive1 archive3
|
|
|
+{"path": "file1", "changes": [{"type": "modified", "added": 17, "removed": 5}, {"type": "mode", "old_mode": "\-rw\-r\-\-r\-\-", "new_mode": "\-rwxr\-xr\-x"}]}
|
|
|
+{"path": "file2", "changes": [{"type": "modified", "added": 135, "removed": 252}]}
|
|
|
+{"path": "file4", "changes": [{"type": "added", "size": 0}]}
|
|
|
+{"path": "file3", "changes": [{"type": "removed", "size": 0}]
|
|
|
.ft P
|
|
|
.fi
|
|
|
.UNINDENT
|