Commits

Commit:
fdf3c2d3876d076bf098461a4d147227126588b4
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
db59069162efd1ccd4f236abe7d8eb3ca4b791e4
From:
Stefan Sperling <stsp@stsp.name>
Date:
make merge_file() accept FILEs instead of paths for orig and deriv inputs
diff | patch | tree
Commit:
1fee9f40e2ed335d4ec8899954b59b43990b97c3
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix 3-way merge of files which lack a final \n problem found by jrick ok millert
diff | patch | tree
Commit:
bc62ede807f0ad3a920fa1e8b05dd90cc8f5f289
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
56b63ca4ab1049de6fa2d6910ce22c16e2b42a53
From:
Stefan Sperling <stsp@stsp.name>
Date:
make fclose(3) failure checks consistent; check 'fclose() == EOF' everywhere ok millert, naddy
diff | patch | tree
Commit:
16aeacf7088dcd3cd5e654af46a3015cecf41426
From:
Stefan Sperling <stsp@stsp.name>
Date:
use size_t for loop indices to avoid signedness warnings; from emaste@freebsd
diff | patch | tree
Commit:
1cb46f007dad47a45d2c2d32aaeee11372f95309
From:
Stefan Sperling <stsp@stsp.name>
Date:
consistently label removed files as "/dev/null" in diff headers
diff | patch | tree
Commit:
64453f7e55c4c69b6cd08229929ed8227b789ff8
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle binary files in got/tog diff commands; add -a options to force text
diff | patch | tree
Commit:
fe621944e83fe6367f7bff97128b4240a9cdc7c5
From:
Stefan Sperling <stsp@stsp.name>
Date:
merge new diff implementation from the git.gameoftrees.org diff.git repository This new diff implementation was started by Neels Hofmeyr during the u2k20 hackathon and now replaces diffreg.c code lifted from the OpenBSD base system. The integration of this code into Got was done by me. Got now uses the patience diff algorithm by default. The diff.git repository will remain the primary repository for the diff code, which already compiles and runs on other operating systems such as Linux. Any fixes and improvements for files inherited from the diff.git repository should be written against that repository and synced to got.git afterwards.
diff | patch | tree
Commit:
21c17f12d490c7f4b55a696178331c5b490a18d4
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix merging with files that do not contain a newline character; ok millert@
diff | patch | tree
Commit:
bb63914a95fa51c7f5dc16d02b8f4ae2736e2e15
From:
Stefan Sperling <stsp@stsp.name>
Date:
make tmp dir location a compile-time setting and change gotweb's tmp dir We are not sure whether a gotweb package can own /var/www/tmp on OpenBSD. Moving gotweb's tmp dir to /var/www/got/tmp sidesteps that issue.
diff | patch | tree
Commit:
937e0e58712b4c76542d1d1485bce7679b7320a6
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix build on sparc64 (uninitialized variable)
diff | patch | tree
Commit:
f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0
From:
Stefan Sperling <stsp@stsp.name>
Date:
show base commit hash and omit filenames in conflict markers
diff | patch | tree
Commit:
d136cfcb987bd2fd865f8711449dc47b7f63455f
From:
Stefan Sperling <stsp@stsp.name>
Date:
show original file content in conflict markers
diff | patch | tree
Commit:
d59c0cb27bc304bc11f9b1094c6eb85f248c7c5f
From:
Stefan Sperling <stsp@stsp.name>
Date:
improve use of mixed size_t/off_t types in diff3.c's edscript()
diff | patch | tree