Commit Briefs

f69721c3fc Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

523b8417c1 Stefan Sperling

handle xbit-only changes during 'got update'

diff | patch | tree

d136cfcb98 Stefan Sperling

show original file content in conflict markers

diff | patch | tree

2a06fe5f59 Stefan Sperling

indicate non-existent paths in 'got status' and make 'got diff' error for them

diff | patch | tree

303e2782e0 Stefan Sperling

add support for tags to -c options of some got commands

diff | patch | tree

305993b9d1 Stefan Sperling

fix typo in test commit log message

diff | patch | tree

9bead37115 Stefan Sperling

relax commit out-of-dateness check: consider file content only

diff | patch | tree

f2ea84fab9 Stefan Sperling

make 'got update' accept mulitple path arguments

diff | patch | tree

54817d72bf Stefan Sperling

fix a status bug exposed by test_update_conflict_wt_rm_vs_repo_rm

diff | patch | tree

a484d721b0 Stefan Sperling

don't report base-bump-only updates as 'already up to date'

diff | patch | tree

1a36436d4d Stefan Sperling

relax out-of-dateness check for 'got commit'

diff | patch | tree

a5e55564f5 Stefan Sperling

fix sandbox name used by test_update_bumps_base_commit_id

diff | patch | tree

a7648d7ad7 Stefan Sperling

consistently use leading upper-case for messages indicating success

diff | patch | tree

a1fb16d88f Stefan Sperling

make moved branch head references easier to deal with

diff | patch | tree

cc43886eb4 Stefan Sperling

improve wording of an error message

diff | patch | tree

d969fa15b6 Stefan Sperling

inform the user when switching branches

diff | patch | tree

c932eeeb83 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

e4d984c230 Stefan Sperling

expand test coverage: partial update with parent dir as argument

diff | patch | tree

a367ff0fba Stefan Sperling

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

diff | patch | tree

024e9686ae Stefan Sperling

add branch support to 'got update'

diff | patch | tree

8d301dd94c Stefan Sperling

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

diff | patch | tree

d5bea53959 Stefan Sperling

fix linear ancestry verification check for 'got update'

diff | patch | tree

c4cdcb68ce Stefan Sperling

add support for partial updates, which affect specific paths only

diff | patch | tree

66b11bf55a Stefan Sperling

add a test for wt rm vs repo rm

diff | patch | tree

fc6346c42a Stefan Sperling

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

diff | patch | tree