diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-15 15:56:37 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-15 16:00:26 -0400 |
| commit | e3f058b6a8aa2548c8207bf9f5e74a49cfe87273 (patch) | |
| tree | 46ea74f45a03b8bc432a71fd71d8b565b92a64d2 /doc/todo | |
| parent | 59654d08a2335bf716f38b76095121c6e4c62535 (diff) | |
implemented upgrade of direct mode repo to v6
Diffstat (limited to 'doc/todo')
| -rw-r--r-- | doc/todo/smudge.mdwn | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn index eeb34f135..6623a6d18 100644 --- a/doc/todo/smudge.mdwn +++ b/doc/todo/smudge.mdwn @@ -323,8 +323,12 @@ files to be unlocked, while the indirect upgrades don't touch the files. * Dropping a smudged file causes git status to show it as modified, because the timestamp has changed. Getting a smudged file can also - cause this. Avoid this by preserving timestamp of smudged files - when manipulating. + cause this. Upgrading a direct mode repo also leaves files in this state. + User can use `git add` to clear it up, but better to avoid this, + by updating stat info in the index. + (May need to use libgit2 to do this, cannot find + any plumbing except git-update-index, which is very inneficient for + smudged files.) * Reconcile staged changes into the associated files database, whenever the database is queried. * See if the cases where the Keys database is not used can be @@ -335,8 +339,6 @@ files to be unlocked, while the indirect upgrades don't touch the files. (when not in direct mode). However, beware over-optimisation breaking the assistant or perhaps other long-lived processes. -* Make v6 upgrade convert direct mode repo to repo with all unlocked - files. * Make automatic merge conflict resolution work for pointer files. - Should probably automatically handle merge conflicts between annex symlinks and pointer files too. Maybe by always resulting in a pointer |