5 years ago c4cdcb68ce Stefan Sperling
add support for partial updates, which affect specific paths only
5 years ago 66b11bf55a Stefan Sperling
add a test for wt rm vs repo rm
5 years ago fc6346c42a Stefan Sperling
don't leave file as unversioned in case of wt edit vs repo rm
5 years ago 13d9040b96 Stefan Sperling
test and improve behaviour for wt edit vs repo rm conflict
5 years ago 085d5bcf0b Stefan Sperling
use a better naming scheme for tree conflict tests
5 years ago 708d8e672e Stefan Sperling
fix behaviour when update deletes an edited file
5 years ago 3165301c5a Stefan Sperling
test conflict resolution in test_update_conflict_add_vs_add
5 years ago 1430b4e093 Stefan Sperling
treat 'add vs add' on update as a text conflict for now
5 years ago 18831e78ba Stefan Sperling
fix another path ordering bug during status/update crawl
5 years ago 1545c6153e Stefan Sperling
show commit id after update even if all files were missing
5 years ago a378724ff7 Stefan Sperling
make 'got update' restore missing files
5 years ago e60e7f5bf0 Stefan Sperling
properly deal with "$?" in cmdline tests; fixes spurious test "ok"
5 years ago ba8a0d4daa Stefan Sperling
clear executable bit when updating files if necessary
5 years ago 68ed9ba51a Stefan Sperling
preserve executable bit on files during checkout and update
5 years ago 6353ad76e4 Stefan Sperling
make 'got update' merge file edits