From ea0d2ac3b9fdd086efa04257b4e2efb60ac370dc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 4 May 2016 14:39:53 -0400 Subject: [PATCH] devblog --- ...ment_1_b7b4819211910556838ec37bc2b6b37b._comment | 0 ...ment_2_8f35254d2cd5d0c273d5392ddd857c2d._comment | 0 doc/design/roadmap.mdwn | 3 ++- doc/devblog/day_388-389__various_and_windows.mdwn | 13 +++++++++++++ 4 files changed, 15 insertions(+), 1 deletion(-) rename doc/design/{v6 => new_repo_versions}/comment_1_b7b4819211910556838ec37bc2b6b37b._comment (100%) rename doc/design/{v6 => new_repo_versions}/comment_2_8f35254d2cd5d0c273d5392ddd857c2d._comment (100%) create mode 100644 doc/devblog/day_388-389__various_and_windows.mdwn diff --git a/doc/design/v6/comment_1_b7b4819211910556838ec37bc2b6b37b._comment b/doc/design/new_repo_versions/comment_1_b7b4819211910556838ec37bc2b6b37b._comment similarity index 100% rename from doc/design/v6/comment_1_b7b4819211910556838ec37bc2b6b37b._comment rename to doc/design/new_repo_versions/comment_1_b7b4819211910556838ec37bc2b6b37b._comment diff --git a/doc/design/v6/comment_2_8f35254d2cd5d0c273d5392ddd857c2d._comment b/doc/design/new_repo_versions/comment_2_8f35254d2cd5d0c273d5392ddd857c2d._comment similarity index 100% rename from doc/design/v6/comment_2_8f35254d2cd5d0c273d5392ddd857c2d._comment rename to doc/design/new_repo_versions/comment_2_8f35254d2cd5d0c273d5392ddd857c2d._comment diff --git a/doc/design/roadmap.mdwn b/doc/design/roadmap.mdwn index 834ab2e871..795cc8c84e 100644 --- a/doc/design/roadmap.mdwn +++ b/doc/design/roadmap.mdwn @@ -1,6 +1,5 @@ ## ahead -* [[adjusted_branches]] * [[design/caching_database]] for metadata views * [[assistant/deltas]] * [[assistant/gpgkeys]] management for the assistant @@ -10,6 +9,8 @@ ## the rearview +* Spring 2016 [[adjusted_branches]] +* Winter 2015 v6 repo format * Mar-Oct 2015 busy busy busy, too busy to update! * Feb 2015 user-driven features and polishing, [[design/caching_database]] part 1 * Jan 2015 Android 5, relative paths, workload [[tuning]] diff --git a/doc/devblog/day_388-389__various_and_windows.mdwn b/doc/devblog/day_388-389__various_and_windows.mdwn new file mode 100644 index 0000000000..b929882b8f --- /dev/null +++ b/doc/devblog/day_388-389__various_and_windows.mdwn @@ -0,0 +1,13 @@ +Lots of little fixes and improvements here and there over the past couple +days. + +The main thing was fixing several bugs with adjusted branches and Windows. +They seem to work now, and commits made on the adjusted branch are +propigated back to master correctly. + +It would be good to finish up the last todos for v6 mode this month. +The sticking point is I need a way to update the file stat in the git index +when git-annex gets/drops/etc an unlocked file. I have not decided yet if +it makes the most sense to add a dependency on libgit2 for that, or extend +`git update-index`, or even write a pure haskell library to manipulate +index files. Each has its pluses and its minuses.