Commits
- Commit:
3b9f0f87ff620ce7d6ad75195b0c67425bc96ab7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle additional symlink conflicts and report skipping of unversioned files
- Commit:
993e2a1b1ac61a9d56877df5325d519f7b737375
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle symlink deletion and symlink conflicts during 'got update'
- Commit:
f35fa46a4c69eaeda5e106115e08b3cf8a0d3413
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add symlink support to 'got update'
- Commit:
e7303626967ed721dd323a8a6ea6c638aed46c50
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add submodule tests
ok semarie
- Commit:
9627c110bee81b5d7368441eaf4e661010ba9cd5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show a summary of conflicts and related problems after updating/merging files
ok millert@
- Commit:
5036ab18bf99be5d6811f17565b2c2fad47b3f73
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' skip conflicted files
ok millert@
- Commit:
f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show base commit hash and omit filenames in conflict markers
- Commit:
523b8417c1fee8faa1a1732ffb036e97ae2ebb4a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle xbit-only changes during 'got update'
- Commit:
d136cfcb987bd2fd865f8711449dc47b7f63455f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show original file content in conflict markers
- Commit:
2a06fe5f59f1b7b42f63bd9afe5187935c341321
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
indicate non-existent paths in 'got status' and make 'got diff' error for them
- Commit:
303e2782e0a61a1cf76da52a945ab8645a8a78ca
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add support for tags to -c options of some got commands
- Commit:
305993b9d1c0203a37c2164c5ed25f53d44a9d40
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix typo in test commit log message
- Commit:
9bead371155cd3f955ba6699b0819df23f008bea
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
relax commit out-of-dateness check: consider file content only
- Commit:
f2ea84fab96c77d352fe460a37f2722beb6225d7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' accept mulitple path arguments
- Commit:
54817d72bf743bcd8d0313b5af1bd9899bbda5e9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix a status bug exposed by test_update_conflict_wt_rm_vs_repo_rm
- Commit:
a484d721b0152ab353a510e75b2aab3cd1aebee3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
don't report base-bump-only updates as 'already up to date'
- Commit:
1a36436d4d4024fada20498cad3039950c4b2da2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
relax out-of-dateness check for 'got commit'
- Commit:
a5e55564f58b7d68b6e454d83114e367ad1520e3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix sandbox name used by test_update_bumps_base_commit_id
- Commit:
a7648d7ad78682e85d33fb8daf304d2eb4ed1c7b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
consistently use leading upper-case for messages indicating success
- Commit:
a1fb16d88f6904f90545c864be8d12c6ea9753b0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make moved branch head references easier to deal with
- Commit:
cc43886eb42b017ad076793f573618dcf9cdb146
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
improve wording of an error message
- Commit:
d969fa15b6179d07a24a4eb86a60749360741fd8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
inform the user when switching branches
- 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