Re: [PATCH 11/18] branch-diff: add tests
- From
Philip Oakley <philipoakley@iee.org>
- Date
- May 3, 2018, 23:27 UTC
- Message-ID
- <8DBB15A6A2AB48C7A9914B5B419E001F@PhilipOakley>
- In-Reply-To
- <fe12b99a0b4f78ab75fcfbcf51c5edffb190c4e8.1525361419.git.johannes.schindelin@gmx.de>
From: "Johannes Schindelin" <johannes.schindelin@gmx.de>
Show 13 quoted lines
> From: Thomas Rast <tr@thomasrast.ch> > > These are essentially lifted from https://github.com/trast/tbdiff, with > light touch-ups to account for the new command name. > > Apart from renaming `tbdiff` to `branch-diff`, only one test case needed > to be adjusted: 11 - 'changed message'. > > The underlying reason it had to be adjusted is that diff generation is > sometimes ambiguous. In this case, a comment line and an empty line are > added, but it is ambiguous whether they were added after the existing > empty line, or whether an empty line and the comment line are added > *before* the existing emtpy line. And apparently xdiff picks a different
s/emtpy/empty/
> option here than Python's difflib. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
[...] Philip