Commit Briefs

Stefan Sperling

make 'got update' bump the base commit ID of unchanged files

This change makes it actually possible to get around commit-time out-of-dateness by running 'got update'. The test added with this commit shows that our out-of-dateness check is currently too simplistic; an update is required between any two commit operations! It would be better to allow commits to proceed until a situation arises where file content must be merged.

diff | patch | tree

Stefan Sperling

expand test coverage: partial update with parent dir as argument

diff | patch | tree

Stefan Sperling

make 'got update' verify that provided commit and branch match

diff | patch | tree

Stefan Sperling

add branch support to 'got update'

diff | patch | tree

Stefan Sperling

use cmp -s, instead of cmp, in all command line tests

diff | patch | tree

Stefan Sperling

fix linear ancestry verification check for 'got update'

diff | patch | tree

Stefan Sperling

add support for partial updates, which affect specific paths only

diff | patch | tree

Stefan Sperling

add a test for wt rm vs repo rm

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

test and improve behaviour for wt edit vs repo rm conflict

diff | patch | tree

Stefan Sperling

use a better naming scheme for tree conflict tests

diff | patch | tree

Stefan Sperling

fix behaviour when update deletes an edited file

diff | patch | tree

Stefan Sperling

test conflict resolution in test_update_conflict_add_vs_add

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

fix another path ordering bug during status/update crawl

diff | patch | tree

Stefan Sperling

show commit id after update even if all files were missing

diff | patch | tree

Stefan Sperling

make 'got update' restore missing files

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

clear executable bit when updating files if necessary

diff | patch | tree

Stefan Sperling

preserve executable bit on files during checkout and update

diff | patch | tree

Stefan Sperling

make 'got update' merge file edits

diff | patch | tree

Stefan Sperling

use path lists to sort dirent, tree object, and file index entries

diff | patch | tree

Stefan Sperling

fix test area name of test_update_creates_missing_parent_with_subdir

diff | patch | tree

Stefan Sperling

fix bug where update got confused by sub-sub directories

diff | patch | tree

Stefan Sperling

fix more bugs in the update walk and add more tests

diff | patch | tree