thought

1 files changed, 12 insertions, 0 deletions

diff --git a/doc/todo/branching.mdwn b/doc/todo/branching.mdwn
index c9707c6f9..b7441c6e4 100644
--- a/doc/todo/branching.mdwn
+++ b/doc/todo/branching.mdwn
@@ -93,3 +93,15 @@ Use filenames like:
 
 That allows one repo to record another's state when doing a
 `move`.
+
+## outside the box approach
+
+If the problem is limited to only that the `.git-annex/` files make
+branching difficult (and not to the related problem that commits to them
+and having them in the tree are sorta annoying), then a simple approach
+would be to have git-annex look in other branches for location log info
+too.
+
+The problem would then be that any locationlog lookup would need to look in
+all other branches (any branch could have more current info after all),
+which could get expensive.