Commits
- Commit:
c932eeeb83c00ba282780d657b539e342d092311
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
e4d984c230e887c67692cfcbb7624ab2ccf95e2d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
expand test coverage: partial update with parent dir as argument
- Commit:
a367ff0fbac77bc991350a4463ee56e3cb0d9e7e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' verify that provided commit and branch match
- Commit:
024e9686ae5fdfe2c0699649dc600c3dd39397f0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add branch support to 'got update'
- Commit:
8d301dd94ca3964729aa83b8031e7502a1111f49
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use cmp -s, instead of cmp, in all command line tests
- Commit:
d5bea53959deb7a1dd486dce9bca4f295c12589b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix linear ancestry verification check for 'got update'
- Commit:
c4cdcb68ce13515b0852719b9690a470731c3d5d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add support for partial updates, which affect specific paths only
- Commit:
66b11bf55ace941fdc76ae52116920008e026bdb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test for wt rm vs repo rm
- Commit:
fc6346c42a66d7fc562608e08dbd41e775facfc4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
don't leave file as unversioned in case of wt edit vs repo rm
- Commit:
13d9040b96f5ba9ac50c137a9909f824dd5bde20
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
test and improve behaviour for wt edit vs repo rm conflict
- Commit:
085d5bcf0b7635235aeaa2608540072bdc88ae99
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use a better naming scheme for tree conflict tests
- Commit:
708d8e672e598275721ee0e9707e5bea2b0435b4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix behaviour when update deletes an edited file
- Commit:
3165301c5af64176c55b5c4c7dbfab343106e3e9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
test conflict resolution in test_update_conflict_add_vs_add
- Commit:
1430b4e093e8dcc1a214e26991cd06d3992db829
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
treat 'add vs add' on update as a text conflict for now
- Commit:
18831e78bad91827323e1c4ee3401a275fdccc6c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix another path ordering bug during status/update crawl
- Commit:
1545c6153ed22df10b02f9353f2054f4c7cb9c53
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show commit id after update even if all files were missing
- Commit:
a378724ff7c52fed47ca10ec7bb827ad4955ce57
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' restore missing files
- Commit:
e60e7f5bf0d3d27834b9712529836b42207853c8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
properly deal with "$?" in cmdline tests; fixes spurious test "ok"
- Commit:
ba8a0d4daae0952f0b83279b0ffc8ab29bcc9c6c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
clear executable bit when updating files if necessary
- Commit:
68ed9ba51a07849681a433ff303ae75cf68aa92d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
preserve executable bit on files during checkout and update
- Commit:
6353ad76e488c8d0df631a779571fdeb41fc9c70
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' merge file edits
- Commit:
f5d3d7af6331314f863498d2e56cfefdf0143b07
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use path lists to sort dirent, tree object, and file index entries
- Commit:
1aad446ab8b63c1789252ebab8a20f9fefc11a3e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix test area name of test_update_creates_missing_parent_with_subdir
- Commit:
21908da4c3cfc3f2d04dd511bd59c1c877f92b14
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix bug where update got confused by sub-sub directories
- Commit:
bd4792ec812265a57f6e881d9bff1f297d325749
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix more bugs in the update walk and add more tests