1
0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-04 22:53:42 +02:00

Merge branch 'help-rdiff-p-in-archives' of https://github.com/JanZerebecki/osc

Improve the documentation of the "rdiff" command + its "--plain" option.
This commit is contained in:
Marcus Huewe
2020-08-25 18:44:56 +02:00

View File

@@ -3986,7 +3986,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.option('-r', '--revision', metavar='N[:M]',
help='revision id, where N = old revision and M = new revision')
@cmdln.option('-p', '--plain', action='store_true',
help='output the diff in plain (not unified) diff format')
help='output the diff in plain (not unified) diff format'
' and show diff of files in archives')
@cmdln.option('-c', '--change', metavar='rev',
help='the change made by revision rev (like -r rev-1:rev). '
'If rev is negative this is like -r rev:rev-1.')
@@ -4004,11 +4005,6 @@ Please submit there instead, or use --nodevelproject to force direct submission.
If no revision is specified the latest revision is used.
Note that this command doesn't return a normal diff (which could be
applied as patch), but a "pretty" diff, which also compares the content
of tarballs.
usage:
osc ${cmd_name} OLDPRJ OLDPAC NEWPRJ [NEWPAC]
osc ${cmd_name} PROJECT PACKAGE