Commit Briefs

c4cdcb68ce Stefan Sperling

add support for partial updates, which affect specific paths only

diff | patch | tree

66b11bf55a Stefan Sperling

add a test for wt rm vs repo rm

diff | patch | tree

fc6346c42a Stefan Sperling

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

diff | patch | tree

13d9040b96 Stefan Sperling

test and improve behaviour for wt edit vs repo rm conflict

diff | patch | tree

085d5bcf0b Stefan Sperling

use a better naming scheme for tree conflict tests

diff | patch | tree

708d8e672e Stefan Sperling

fix behaviour when update deletes an edited file

diff | patch | tree

3165301c5a Stefan Sperling

test conflict resolution in test_update_conflict_add_vs_add

diff | patch | tree

1430b4e093 Stefan Sperling

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

diff | patch | tree

18831e78ba Stefan Sperling

fix another path ordering bug during status/update crawl

diff | patch | tree

1545c6153e Stefan Sperling

show commit id after update even if all files were missing

diff | patch | tree

a378724ff7 Stefan Sperling

make 'got update' restore missing files

diff | patch | tree

e60e7f5bf0 Stefan Sperling

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

diff | patch | tree

ba8a0d4daa Stefan Sperling

clear executable bit when updating files if necessary

diff | patch | tree

68ed9ba51a Stefan Sperling

preserve executable bit on files during checkout and update

diff | patch | tree

6353ad76e4 Stefan Sperling

make 'got update' merge file edits

diff | patch | tree