Gotweb

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

3 years ago Stefan Sperling

check for close(2) error in got_repo_close() and propagate errors up

ok tracey

diff | patch | tree

3 years ago Stefan Sperling

This was a long-standing and very annoying bug. The two xfail tests in the cherrypick test suite are passing now.

diff | patch | tree

3 years ago Stefan Sperling

switch merge_file_cb() to using merge_file() instead of merge_blob()

diff | patch | tree

3 years ago Stefan Sperling

decouple merge_file() parameters for 2nd derived version and merge target file

diff | patch | tree

3 years ago Stefan Sperling

in merge_file(), remove allocation of a base_path which is unused

diff | patch | tree

3 years ago Stefan Sperling

move merge_file()'s f_deriv parameter next to the f_orig parameter

diff | patch | tree

3 years ago Stefan Sperling

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

diff | patch | tree

3 years ago Stefan Sperling

refactor merge_file() such that it no longer requires a blob object parameter

diff | patch | tree

3 years ago Stefan Sperling

do not update symlinks which are already up-to-date

This fixes spurious 'U' notifications for symlinks during 'got update' that occurred even when the work tree was fully up-to-date. Observed on a work tree of the FreeBSD src repo and reproduced in our test suite by adding a no-op update at the end of a test which deals with updating symlinks.

diff | patch | tree

3 years ago Stefan Sperling

add a missing STATUS_EXISTS notification in update_blob()

diff | patch | tree

More ↓