From 0db393d82f02f60b53d1e79062aa79395ed8c90c Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 5 Mar 2019 17:19:26 -0400
Subject: [PATCH] add bug

---
 doc/todo/import_tree.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/todo/import_tree.mdwn b/doc/todo/import_tree.mdwn
index 596a2edff9..36df096287 100644
--- a/doc/todo/import_tree.mdwn
+++ b/doc/todo/import_tree.mdwn
@@ -10,6 +10,10 @@ this.
 
 ## implementation notes
 
+* After adding a new file with different content to local and remote, then
+  importing and resolving the merge conflict, exporting the resolution
+  fails. It seems it's lost the old CID for the remote's content.
+
 * getknowncids should run "updateexportdb exportdb exportdbv",
   but that leads to a STM deadlock for some reason?