Commit Briefs




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.


Stefan Sperling

resolve an XXX remark in merge_file_cb()



Stefan Sperling

extend test_commit_symlink test case


Stefan Sperling

add symlink support to 'got import'





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.




Stefan Sperling

remove debugging test code