Commits

Commit:
f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0
From:
Stefan Sperling <stsp@stsp.name>
Date:
show base commit hash and omit filenames in conflict markers
diff | patch | tree
Commit:
523b8417c1fee8faa1a1732ffb036e97ae2ebb4a
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle xbit-only changes during 'got update'
diff | patch | tree
Commit:
d136cfcb987bd2fd865f8711449dc47b7f63455f
From:
Stefan Sperling <stsp@stsp.name>
Date:
show original file content in conflict markers
diff | patch | tree
Commit:
2a06fe5f59f1b7b42f63bd9afe5187935c341321
From:
Stefan Sperling <stsp@stsp.name>
Date:
indicate non-existent paths in 'got status' and make 'got diff' error for them
diff | patch | tree
Commit:
303e2782e0a61a1cf76da52a945ab8645a8a78ca
From:
Stefan Sperling <stsp@stsp.name>
Date:
add support for tags to -c options of some got commands
diff | patch | tree
Commit:
305993b9d1c0203a37c2164c5ed25f53d44a9d40
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix typo in test commit log message
diff | patch | tree
Commit:
9bead371155cd3f955ba6699b0819df23f008bea
From:
Stefan Sperling <stsp@stsp.name>
Date:
relax commit out-of-dateness check: consider file content only
diff | patch | tree
Commit:
f2ea84fab96c77d352fe460a37f2722beb6225d7
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got update' accept mulitple path arguments
diff | patch | tree
Commit:
54817d72bf743bcd8d0313b5af1bd9899bbda5e9
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix a status bug exposed by test_update_conflict_wt_rm_vs_repo_rm
diff | patch | tree
Commit:
a484d721b0152ab353a510e75b2aab3cd1aebee3
From:
Stefan Sperling <stsp@stsp.name>
Date:
don't report base-bump-only updates as 'already up to date'
diff | patch | tree
Commit:
1a36436d4d4024fada20498cad3039950c4b2da2
From:
Stefan Sperling <stsp@stsp.name>
Date:
relax out-of-dateness check for 'got commit'
diff | patch | tree
Commit:
a5e55564f58b7d68b6e454d83114e367ad1520e3
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix sandbox name used by test_update_bumps_base_commit_id
diff | patch | tree
Commit:
a7648d7ad78682e85d33fb8daf304d2eb4ed1c7b
From:
Stefan Sperling <stsp@stsp.name>
Date:
consistently use leading upper-case for messages indicating success
diff | patch | tree
Commit:
a1fb16d88f6904f90545c864be8d12c6ea9753b0
From:
Stefan Sperling <stsp@stsp.name>
Date:
make moved branch head references easier to deal with
diff | patch | tree
Commit:
cc43886eb42b017ad076793f573618dcf9cdb146
From:
Stefan Sperling <stsp@stsp.name>
Date:
improve wording of an error message
diff | patch | tree
Commit:
d969fa15b6179d07a24a4eb86a60749360741fd8
From:
Stefan Sperling <stsp@stsp.name>
Date:
inform the user when switching branches
diff | patch | tree
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.
diff | patch | tree
Commit:
e4d984c230e887c67692cfcbb7624ab2ccf95e2d
From:
Stefan Sperling <stsp@stsp.name>
Date:
expand test coverage: partial update with parent dir as argument
diff | patch | tree
Commit:
a367ff0fbac77bc991350a4463ee56e3cb0d9e7e
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got update' verify that provided commit and branch match
diff | patch | tree
Commit:
024e9686ae5fdfe2c0699649dc600c3dd39397f0
From:
Stefan Sperling <stsp@stsp.name>
Date:
add branch support to 'got update'
diff | patch | tree
Commit:
8d301dd94ca3964729aa83b8031e7502a1111f49
From:
Stefan Sperling <stsp@stsp.name>
Date:
use cmp -s, instead of cmp, in all command line tests
diff | patch | tree
Commit:
d5bea53959deb7a1dd486dce9bca4f295c12589b
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix linear ancestry verification check for 'got update'
diff | patch | tree
Commit:
c4cdcb68ce13515b0852719b9690a470731c3d5d
From:
Stefan Sperling <stsp@stsp.name>
Date:
add support for partial updates, which affect specific paths only
diff | patch | tree
Commit:
66b11bf55ace941fdc76ae52116920008e026bdb
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a test for wt rm vs repo rm
diff | patch | tree
Commit:
fc6346c42a66d7fc562608e08dbd41e775facfc4
From:
Stefan Sperling <stsp@stsp.name>
Date:
don't leave file as unversioned in case of wt edit vs repo rm
diff | patch | tree