diff-options parser misses '-f', '--forward-ed', & '--context'
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
Richard Wilbur |
Bug Description
In its attempt to default the diff format to 'unified', the parser doesn't recognize '-f', '--forward-ed', or '--context' and thus adds '-u' which diff rightfully complains about--inconsistent format options.
~/src/bzr/bzrlib$ bzr diff --diff-options='-f' -r-2.. diff.py
=== modified file 'bzrlib/diff.py'
diff: conflicting output style options
diff: Try `diff --help' for more information.
bzr: ERROR: external diff failed with exit code 2; command: ['diff', '--label', u'bzrlib/
~/src/bzr/bzrlib$ bzr diff --diff-
=== modified file 'bzrlib/diff.py'
diff: conflicting output style options
diff: Try `diff --help' for more information.
bzr: ERROR: external diff failed with exit code 2; command: ['diff', '--label', u'bzrlib/
~/src/bzr/bzrlib$ bzr diff --diff-
=== modified file 'bzrlib/diff.py'
diff: conflicting output style options
diff: Try `diff --help' for more information.
bzr: ERROR: external diff failed with exit code 2; command: ['diff', '--label', u'bzrlib/
This is already confirmed by Sebastien Alaiwan on 11 Jun 2014 in his merge request for a branch to address a different diff problem: https:/
Changed in bzr: | |
status: | Fix Committed → Fix Released |
Merged a fix into trunk with https:/ /code.launchpad .net/~richard- wilbur/ bzr/update- diff-format- parser/ +merge/ 234855