From 1720f9f8513378fef3dd5269492b379650b019e7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 4 Apr 2016 13:55:15 -0400
Subject: [PATCH] still bug with sync in adjusted branch

---
 doc/design/adjusted_branches.mdwn | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn
index 90f880e64c..28fecb2c5b 100644
--- a/doc/design/adjusted_branches.mdwn
+++ b/doc/design/adjusted_branches.mdwn
@@ -351,6 +351,32 @@ into adjusted view worktrees.]
   will make copies of the content of annexed files, so this would need
   to checkout the adjusted branch some other way. Maybe generalize so this
   more efficient checkout is available as a git-annex command?
+* sync in adjusted branch can trigger merge conflict detection where
+  there should be no conflict.
+
+	git init a
+	cd a
+	git annex init --version=6
+	touch f
+	git annex add f
+	git annex sync
+	cd ..
+
+	git clone a b
+	cd b
+	git annex init --version=6
+	git annex adjust --unlock
+	cd ..
+
+	cd a
+	git mv f f2
+	git annex sync
+	cd ..
+
+	cd b
+	git annex sync
+
+
 * There are potentially races in code that assumes a branch like
   master is not being changed by someone else. In particular,
   propigateAdjustedCommits rebases the adjusted branch on top of master.