From 2d7f295b905ccfbda23afbaa5fea3b8bc48cffba Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 17 May 2019 21:14:51 -0400 Subject: [PATCH] todo --- .../surprising_import_tree_merge_result.mdwn | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 doc/bugs/surprising_import_tree_merge_result.mdwn diff --git a/doc/bugs/surprising_import_tree_merge_result.mdwn b/doc/bugs/surprising_import_tree_merge_result.mdwn new file mode 100644 index 0000000000..7831eb2a5d --- /dev/null +++ b/doc/bugs/surprising_import_tree_merge_result.mdwn @@ -0,0 +1,21 @@ +Had a surprising result of an import tree merge. I am importing photos +from my phone. I had earlier imported some photos and moved the whole tree +containing them from phone/DCIM to raw/photos/something. Then I took a new photo, +and imported again. + +one. In commit cd55a5be377020b7261c3a737b5e32a01e22f4b8 "import from phone" +that added a `phone/DCIM/Camera/IMG_20190516_111640.jpg`. + +But then in the merge commit a548a51de2566c26f74b5791eb0660e4d79e2cb7 +that merged phone/master into master, the new photo moved into +raw/photos/something + +This is quite surprising. It seems somehow when it modified the old +tree, it rooted the new at the location the old had been moved to in +master. + +---- + +Also, commit cd55a5be377020b7261c3a737b5e32a01e22f4b8 had no parent, so +git diff --stat shows it as adding every file that was in the tree before +as well as the imported files, which seems wrong at least visually.