Commits
- Commit:
24f136e0f955e179395f9d081b45fbea32f02325- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
preverse binary files during updates and merges
- Commit:
d27f86179a20035dda9a5eb0d74dda269dae671c- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
set oldo.to in diff3.c's duplicate() even if the file contains no newlines
- Commit:
8e831ff19c364e7b4a4d77885cd3421502daeed3- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
always initialize output parameter "n" of get_line() in diff3.c
- Commit:
3c7939fe2bc71876feb1b5c144e95c69f60d2763- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix another segfault in edscript()
Same problem as fixed in 90de04bc7f1b85b9c491bcd124f6178fad005de1.
ok stsp
- Commit:
b6c8e5e0edc57f309ae866114527e614ad0cd76d- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix a segfault in edscript() introduced by my previous commit
Found by our cherrypick regression tests.
- Commit:
461f6aedbd48fa1a352a579c70013ff02d50a6c5- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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
- Commit:
dd038bc6ec835ad3fd3c0b5303b8af9ad506c8cc- From:
- Thomas Adam <thomas@xteddy.org>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
portable: initial Linux compilation
This commit modifies the GoT main branch to be able to compile it under
linux.
- Commit:
abc59930d57a2d46c310e1b0c758c948554bc1af- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
indentation fixes
- 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.
- Commit:
db59069162efd1ccd4f236abe7d8eb3ca4b791e4- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make merge_file() accept FILEs instead of paths for orig and deriv inputs
- 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
- 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.
- Commit:
56b63ca4ab1049de6fa2d6910ce22c16e2b42a53- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make fclose(3) failure checks consistent; check 'fclose() == EOF' everywhere
ok millert, naddy
- Commit:
16aeacf7088dcd3cd5e654af46a3015cecf41426- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use size_t for loop indices to avoid signedness warnings; from emaste@freebsd
- Commit:
1cb46f007dad47a45d2c2d32aaeee11372f95309- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
consistently label removed files as "/dev/null" in diff headers
- Commit:
64453f7e55c4c69b6cd08229929ed8227b789ff8- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle binary files in got/tog diff commands; add -a options to force text
- 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.
- Commit:
21c17f12d490c7f4b55a696178331c5b490a18d4- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix merging with files that do not contain a newline character; ok millert@
- 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.
- Commit:
937e0e58712b4c76542d1d1485bce7679b7320a6- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix build on sparc64 (uninitialized variable)
- Commit:
f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show base commit hash and omit filenames in conflict markers
- Commit:
d136cfcb987bd2fd865f8711449dc47b7f63455f- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show original file content in conflict markers
- Commit:
d59c0cb27bc304bc11f9b1094c6eb85f248c7c5f- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
improve use of mixed size_t/off_t types in diff3.c's edscript()
- Commit:
b2338effff1d654d54ab1abfdebefee508ea1a6c- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
diff3.c: do not use the same variables for both line numbers and byte offsets
- Commit:
887758148e9d113851e356d0339dc4a726b04bc0- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
diff3.c's skip() returns number of bytes skipped so switch from int to size_t