Commit Briefs

Stefan Sperling

wrap overlong lines

diff | patch | tree

Stefan Sperling

add "e" (close-on-exec) flag to fopen(3) calls

suggested by millert ok thomas_adam

diff | patch | tree

Stefan Sperling

preverse binary files during updates and merges

diff | patch | tree

Stefan Sperling

set oldo.to in diff3.c's duplicate() even if the file contains no newlines

diff | patch | tree

Stefan Sperling

always initialize output parameter "n" of get_line() in diff3.c

diff | patch | tree

Christian Weisgerber

fix another segfault in edscript()

Same problem as fixed in 90de04bc7f1b85b9c491bcd124f6178fad005de1. ok stsp

diff | patch | tree

Stefan Sperling

fix a segfault in edscript() introduced by my previous commit

Found by our cherrypick regression tests.

diff | patch | tree

Stefan Sperling

fix merging of files which contain a dot on a line by itself

Annoying bug which we inherited from OpenRCS which inherited it from OpenBSD's diff3 program. ok tracey millert

diff | patch | tree

Christian Weisgerber

indentation fixes

diff | patch | tree

Stefan Sperling

use Patience diff for merging during cherrypick/backout/histedit/rebase

This has been shown to prevent mis-merges in some cases. It's probably not a final solution. We should look at what Git's "recursive merge" is doing and implement something similar. Keep using Myers during update/unstage. The advantage of Myers is that it produces smaller conflict chunks, and there are no known cases of mis-merges which affect update/unstage.

diff | patch | tree

Stefan Sperling

make merge_file() accept FILEs instead of paths for orig and deriv inputs

diff | patch | tree

Stefan Sperling

fix 3-way merge of files which lack a final \n

problem found by jrick ok millert

diff | patch | tree

Stefan Sperling

use Myers diff instead of Patience diff when merging files with diff3

Myers diff tends to divide files into smaller diff chunks, while Patience diff attemps to maximize the size of diff chunks. Smaller diffs chunks generally result in a more managable presentation of merge conflicts.

diff | patch | tree

Stefan Sperling

make fclose(3) failure checks consistent; check 'fclose() == EOF' everywhere

ok millert, naddy

diff | patch | tree

Stefan Sperling

use size_t for loop indices to avoid signedness warnings; from emaste@freebsd

diff | patch | tree