Commits


add support for partial updates, which affect specific paths only


add a test for wt rm vs repo rm


don't leave file as unversioned in case of wt edit vs repo rm


test and improve behaviour for wt edit vs repo rm conflict


use a better naming scheme for tree conflict tests


fix behaviour when update deletes an edited file


test conflict resolution in test_update_conflict_add_vs_add


treat 'add vs add' on update as a text conflict for now


fix another path ordering bug during status/update crawl


show commit id after update even if all files were missing


make 'got update' restore missing files


properly deal with "$?" in cmdline tests; fixes spurious test "ok"


clear executable bit when updating files if necessary


preserve executable bit on files during checkout and update


make 'got update' merge file edits