mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

update

Browse source
This commit is contained in:
Joey Hess 2016-02-09 16:26:55 -04:00
parent 5d05aad74c
commit 73cca6e8c1
Failed to extract signature
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/design/adjusted_branches.mdwn
View file

@ -161,6 +161,13 @@ If the user refers to commit shas (in, eg commit messages), those won't be
visible to anyone else.
[WORKTREE: not a problem]
When a pull modifies a file, its content won't be available, and so it
would be hidden temporarily by filter #2. So the file would seem to vanish,
and come back later, which could be confusing. Could be fixed as discussed
in [[todo/deferred_update_mode]]. Arguably, it's just as confusing for the
file to remain visible but have its content temporarily replaced with a
annex pointer.
## integration with view branches
Entering a view from an adjusted branch should probably carry the filtering

10
doc/todo/deferred_update_mode.mdwn
View file

@ -27,7 +27,9 @@ annex.merge=trydownloadfirst and annex.merge=reqdownloadfirst
Let `git annex merge` be used to force a merge, even when content is not
available.
> I think this is the wrong solution, and [[hide_missing_files]] is a
> better approach to the same problem. See [[design/adjusted_branches]].
>
> Closing as dup. [[done]] --[[Joey]]
## alternatively
What about just making `git-annex sync --content` try to get the content of
all files before updating the work tree? (The assistant would need changes
too; it would need to queue all the downloads and trigger a work tree
update once all the downloads have been tried.)