Commit Briefs

Stefan Sperling

handle additional symlink conflicts and report skipping of unversioned files

diff | patch | tree

Stefan Sperling

preserve unversioned files when merging added symlinks

diff | patch | tree

Stefan Sperling

add an output argument to create_fileindex_entry()

Avoids a pointless search of the file index in the case the caller needs to use the newly created file entry.

diff | patch | tree

Stefan Sperling

give bad symlinks a dedicated file type in the file index

diff | patch | tree

Stefan Sperling

use default file permissions when installing "bad" symlinks

diff | patch | tree

Stefan Sperling

keep file index entry permission bits clear for symlinks

diff | patch | tree

Stefan Sperling

restore unversioned file test case in test_cherrypick_symlink_conflicts

One part of current behaviour is to delete an unversioned file and replace it with a symlink; that's very bad in case the user wants to keep the file.

diff | patch | tree

Stefan Sperling

resolve an XXX remark in merge_file_cb()

diff | patch | tree

Stefan Sperling

test_cherrypick_symlink_conflicts forgot to run 'got add' on a file; fix this

diff | patch | tree

Stefan Sperling

extend test_commit_symlink test case

diff | patch | tree

Stefan Sperling

add symlink support to 'got import'

diff | patch | tree

Stefan Sperling

handle symlink deletion and symlink conflicts during 'got update'

diff | patch | tree

Stefan Sperling

We must null-terminate the result of readlink(3) in merge_symlink().

diff | patch | tree

Stefan Sperling

handle symlink conflicts by installing a file that contains conflict markers

diff | patch | tree

Stefan Sperling

add cherrypick test for symlink conflict cases

This test accepts the current behaviour, even though the current behaviour isn't ideal in some cases.

diff | patch | tree