mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

todo

Browse source
This commit is contained in:
Joey Hess 2019-05-17 21:14:51 -04:00
parent 8958556fe3
commit 2d7f295b90
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
doc/bugs/surprising_import_tree_merge_result.mdwn Normal file
View file

@ -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.