diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-01-08 16:30:31 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-01-08 16:30:31 -0400 |
commit | 1491ad5d26b80b8404f35d26b7d6959c8b62a6d0 (patch) | |
tree | db7945c0edf3cafac867398d80a4942652267b2a | |
parent | fa88037c46b3d7094e854397b954b478cf246caa (diff) |
update
-rw-r--r-- | debian/changelog | 10 | ||||
-rw-r--r-- | doc/todo/smudge.mdwn | 19 |
2 files changed, 15 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index 49af4347f..163c6d85b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,17 +3,19 @@ git-annex (6.20151219) UNRELEASED; urgency=medium "hexapodia as the key insight" * Added v6 repository mode, but v5 is still the default for now. + * unlock, lock: In v6 mode, unlocking a file changes it from a symlink to a + pointer file, and this change can be committed to the git repository. + For details, see http://git-annex.branchable.com/tips/unlocked_files/ * The upgrade to version 6 is not done fully automatically yet, because upgrading a direct mode repository to version 6 will prevent old versions of git-annex from working in other clones of that repository. + For details, see http://git-annex.branchable.com/upgrades/ * init: --version parameter added to control which supported repository version to use. * init, upgrade: Configure .git/info/attributes to use git-annex as a smudge filter. In v6 repository mode, this makes git add - add files to the annex, unless overridden by annex.largefiles - configuration. - * unlock, lock: In v6 mode, unlocking a file changes it from a symlink to a - pointer file, and this change can be committed to the git repository. + add files to the annex in unlocked mode, unless overridden by + annex.largefiles configuration. * assistant: In v6 mode, adds files in unlocked mode, so they can continue to be modified. * Added annex.thin setting, which makes unlocked files in v6 repositories diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn index 8bea3dac9..6498863e4 100644 --- a/doc/todo/smudge.mdwn +++ b/doc/todo/smudge.mdwn @@ -2,9 +2,14 @@ git-annex should use smudge/clean filters. ### implementation todo list -* Intermittent sqlite related test suite failures, with: - Exception: failed to commit changes to sqlite database: Just SQLite3 returned ErrorIO while attempting to perform step. - sqlite worker thread crashed: SQLite3 returned ErrorError while attempting to perform step. +* Interaction with shared clones. Should avoid hard linking from/to a + object in a shared clone if either repository has the object unlocked + with a hard link in place. + (And should avoid unlocking an object with a hard link if it's hard + linked to a shared clone, but that's already accomplished because it + avoids unlocking an object if it's hard linked at all) + **release blocker** + * Reconcile staged changes into the associated files database, whenever the database is queried. This is needed to handle eg: git add largefile @@ -13,12 +18,6 @@ git-annex should use smudge/clean filters. # fails to drop content from associated file othername, # because it doesn't know it has that name # git commit clears up this mess -* Interaction with shared clones. Should avoid hard linking from/to a - object in a shared clone if either repository has the object unlocked - with a hard link in place. - (And should avoid unlocking an object with a hard link if it's hard - linked to a shared clone, but that's already accomplished because it - avoids unlocking an object if it's hard linked at all) * Dropping a smudged file causes git status (and git annex status) to show it as modified, because the timestamp has changed. Getting a smudged file can also cause this. @@ -44,7 +43,7 @@ git-annex should use smudge/clean filters. * Eventually (but not yet), make v6 the default for new repositories. Note that the assistant forces repos into direct mode; that will need to - be changed then, and it should enable annex.thin. + be changed then, and it should enable annex.thin instead. * Later still, remove support for direct mode, and enable automatic v5 to v6 upgrades. |