diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-05-30 17:01:22 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-05-30 17:01:22 -0400 |
| commit | 65977a558446fd4208b04614191b68bae838b044 (patch) | |
| tree | 0ad6b92ccea3e4e228f93f906fd5bbfd2cba417e /doc | |
| parent | 96f00bafd033049ae257903f3815d296e3d335ff (diff) | |
lock: Reset unlocked file to index, rather than to branch head.
Resetting an unlocked file to the branch head failed if it had just been
added, not committed, and unlocked, since the branch didbn't have it.
The code was concerned about dropping any changes that might be staged in the
index, but I cannot see why.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/unlock_then_lock_of_uncommitted_file_loses_it.mdwn | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/bugs/unlock_then_lock_of_uncommitted_file_loses_it.mdwn b/doc/bugs/unlock_then_lock_of_uncommitted_file_loses_it.mdwn index 69704bdd0..9c093de38 100644 --- a/doc/bugs/unlock_then_lock_of_uncommitted_file_loses_it.mdwn +++ b/doc/bugs/unlock_then_lock_of_uncommitted_file_loses_it.mdwn @@ -1,5 +1,7 @@ -Add a file, then unlock it, and then lock it. There is an error and the -symlink gets deleted. +Add a file (do not commit), then unlock it, and then lock it. +There is an error and the symlink gets deleted. The file will still be staged in the index, and the file content is still in the annex. --[[Joey]] + +[[done]] |