From cbd732008b387f205df8c84590fdcdcb5a39ed3a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 9 Feb 2016 16:26:55 -0400 Subject: update --- doc/design/adjusted_branches.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc/design') diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index 93979ca61..5c70e4ea9 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -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 -- cgit v1.2.3