summaryrefslogtreecommitdiff
path: root/doc/design
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-04 13:17:24 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-04 13:17:24 -0400
commit9b3a2e6c91afb886f1743769a5100fcf056d6ea7 (patch)
tree282232aee8154832c631d9c7efc87062140051fe /doc/design
parentf312b66a5cfc99ca5f01a07755f645659e75564a (diff)
Upgrading a direct mode repository to v6 has changed to enter an adjusted unlocked branch.
This makes the direct mode to v6 upgrade able to be performed in one clone of a repository without affecting other clones, which can continue using v5 and direct mode.
Diffstat (limited to 'doc/design')
-rw-r--r--doc/design/adjusted_branches.mdwn1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn
index a4fd40650..6f71112b2 100644
--- a/doc/design/adjusted_branches.mdwn
+++ b/doc/design/adjusted_branches.mdwn
@@ -347,7 +347,6 @@ into adjusted view worktrees.]
## TODOs
* Interface in webapp to enable adjustments.
-* Upgrade from direct mode to v6 in unlocked branch.
* Honor annex.thin when entering an adjusted branch.
* Cloning a repo that has an adjusted branch checked out gets into an ugly
state.