|
3b9f0f87
|
2020-07-23T14:22:35
|
|
handle additional symlink conflicts and report skipping of unversioned files
|
|
|
993e2a1b
|
2020-07-23T14:21:31
|
|
handle symlink deletion and symlink conflicts during 'got update'
|
|
|
f35fa46a
|
2020-07-23T14:21:27
|
|
add symlink support to 'got update'
|
|
|
e7303626
|
2020-05-14T19:27:44
|
|
add submodule tests
ok semarie
|
|
|
9627c110
|
2020-04-18T18:40:01
|
|
show a summary of conflicts and related problems after updating/merging files
ok millert@
|
|
|
5036ab18
|
2020-04-18T18:40:00
|
|
make 'got update' skip conflicted files
ok millert@
|
|
|
f69721c3
|
2019-10-21T09:04:57
|
|
show base commit hash and omit filenames in conflict markers
|
|
|
523b8417
|
2019-10-19T11:06:55
|
|
handle xbit-only changes during 'got update'
|
|
|
d136cfcb
|
2019-10-12T07:33:12
|
|
show original file content in conflict markers
|
|
|
2a06fe5f
|
2019-08-24T12:58:07
|
|
indicate non-existent paths in 'got status' and make 'got diff' error for them
|
|
|
303e2782
|
2019-08-09T13:37:56
|
|
add support for tags to -c options of some got commands
|
|
|
305993b9
|
2019-07-28T10:30:06
|
|
fix typo in test commit log message
|
|
|
9bead371
|
2019-07-28T10:28:25
|
|
relax commit out-of-dateness check: consider file content only
|
|
|
f2ea84fa
|
2019-07-27T14:26:10
|
|
make 'got update' accept mulitple path arguments
|
|
|
54817d72
|
2019-07-27T12:40:05
|
|
fix a status bug exposed by test_update_conflict_wt_rm_vs_repo_rm
|
|
|
a484d721
|
2019-06-10T12:10:37
|
|
don't report base-bump-only updates as 'already up to date'
|
|
|
1a36436d
|
2019-06-10T11:58:32
|
|
relax out-of-dateness check for 'got commit'
|
|
|
a5e55564
|
2019-06-10T11:33:29
|
|
fix sandbox name used by test_update_bumps_base_commit_id
|
|
|
a7648d7a
|
2019-06-02T21:35:20
|
|
consistently use leading upper-case for messages indicating success
|
|
|
a1fb16d8
|
2019-05-24T14:51:46
|
|
make moved branch head references easier to deal with
|
|
|
cc43886e
|
2019-05-22T15:28:17
|
|
improve wording of an error message
|
|
|
d969fa15
|
2019-05-22T15:20:10
|
|
inform the user when switching branches
|
|
|
c932eeeb
|
2019-05-22T10:25:50
|
|
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.
|
|
|
e4d984c2
|
2019-05-22T10:02:45
|
|
expand test coverage: partial update with parent dir as argument
|
|
|
a367ff0f
|
2019-05-14T14:23:00
|
|
make 'got update' verify that provided commit and branch match
|
|
|
024e9686
|
2019-05-14T13:22:16
|
|
add branch support to 'got update'
|
|
|
8d301dd9
|
2019-05-14T11:35:15
|
|
use cmp -s, instead of cmp, in all command line tests
|
|
|
d5bea539
|
2019-05-13T10:56:28
|
|
fix linear ancestry verification check for 'got update'
|
|
|
c4cdcb68
|
2019-04-03T16:17:53
|
|
add support for partial updates, which affect specific paths only
|
|
|
66b11bf5
|
2019-03-27T12:58:26
|
|
add a test for wt rm vs repo rm
|
|
|
fc6346c4
|
2019-03-27T12:51:30
|
|
don't leave file as unversioned in case of wt edit vs repo rm
|
|
|
13d9040b
|
2019-03-27T12:33:41
|
|
test and improve behaviour for wt edit vs repo rm conflict
|
|
|
085d5bcf
|
2019-03-27T12:03:38
|
|
use a better naming scheme for tree conflict tests
|
|
|
708d8e67
|
2019-03-27T12:00:59
|
|
fix behaviour when update deletes an edited file
|
|
|
3165301c
|
2019-03-27T08:23:30
|
|
test conflict resolution in test_update_conflict_add_vs_add
|
|
|
1430b4e0
|
2019-03-27T08:18:28
|
|
treat 'add vs add' on update as a text conflict for now
|
|
|
18831e78
|
2019-02-10T16:32:21
|
|
fix another path ordering bug during status/update crawl
|
|
|
1545c615
|
2019-02-10T13:23:52
|
|
show commit id after update even if all files were missing
|
|
|
a378724f
|
2019-02-10T13:20:43
|
|
make 'got update' restore missing files
|
|
|
e60e7f5b
|
2019-02-10T13:03:27
|
|
properly deal with "$?" in cmdline tests; fixes spurious test "ok"
|
|
|
ba8a0d4d
|
2019-02-10T12:30:06
|
|
clear executable bit when updating files if necessary
|
|
|
68ed9ba5
|
2019-02-10T12:02:52
|
|
preserve executable bit on files during checkout and update
|
|
|
6353ad76
|
2019-02-08T15:12:00
|
|
make 'got update' merge file edits
|
|
|
f5d3d7af
|
2019-02-05T15:19:24
|
|
use path lists to sort dirent, tree object, and file index entries
|
|
|
1aad446a
|
2019-01-13T17:19:24
|
|
fix test area name of test_update_creates_missing_parent_with_subdir
|
|
|
21908da4
|
2019-01-13T13:59:20
|
|
fix bug where update got confused by sub-sub directories
|
|
|
bd4792ec
|
2019-01-13T12:56:35
|
|
fix more bugs in the update walk and add more tests
|
|
|
4a1ddfc2
|
2019-01-12T22:15:58
|
|
fix bug where update forgot to create a parent directory
|
|
|
46cee7a3
|
2019-01-12T21:45:46
|
|
add two more tests for update
|
|
|
50952927
|
2019-01-12T21:00:42
|
|
fix various issues in new update implementation
|
|
|
4482e97b
|
2019-01-09T00:50:37
|
|
shorten test name
|
|
|
81a30460
|
2019-01-09T00:41:58
|
|
fix a path matching bug in collect_missing_file()
|
|
|
90285c3b
|
2019-01-08T20:13:18
|
|
properly remove empty directories left behind during updates
|
|
|
52a3df9b
|
2019-01-06T13:55:32
|
|
remove some unnecessary verification from update tests
|
|
|
5cc266ba
|
2019-01-06T13:14:54
|
|
make 'got update' remove directories in a checkout with path prefix
|
|
|
f5c49f82
|
2019-01-06T12:12:16
|
|
make 'got update' remove empty directories
|
|
|
693719bc
|
2019-01-03T01:00:30
|
|
don't clobber cmp's exit code with diff's exit code
|
|
|
512f0d0e
|
2019-01-03T00:57:49
|
|
make 'got update' remove files which were deleted
|
|
|
3b4d3732
|
2019-01-02T22:03:34
|
|
test update with an added file
|
|
|
3c90ba67
|
2019-01-02T16:16:39
|
|
discard output of 'got checkout' in basic update test
|
|
|
9c4b8182
|
2019-01-02T16:11:39
|
|
print new base commit ID when update is done
|
|
|
0fbd721f
|
2019-01-02T15:56:12
|
|
fix testroot path used by basic update test
|
|
|
c84d8c75
|
2019-01-02T15:55:17
|
|
basic cmdline test for 'got update'
|