diff options
Diffstat (limited to 'doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__')
9 files changed, 0 insertions, 284 deletions
diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_1_e25451863622eefed664f6a210cbe67d._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_1_e25451863622eefed664f6a210cbe67d._comment deleted file mode 100644 index f0abd4507..000000000 --- a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_1_e25451863622eefed664f6a210cbe67d._comment +++ /dev/null @@ -1,72 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawno-jcsScu4CK6k2QLZqxMros1PQHf1NQY" - nickname="Hugo" - subject="Sync messed up" - date="2014-03-09T12:16:32Z" - content=""" -So, I have now reseted to a previous commit all the branches: git-annex, master, synced/git-annex and synced/master in other usb drives. i can git pull and git push, etc. But every time I try a git annex sync, it's deleting files again. - -For instance: - -``````````````` -(merging laptop/git-annex laptop/synced/git-annex into git-annex...) -(Recording state in git...) -commit ok -pull wdrouge -Depuis /run/media/hrd/WD-rouge/annex/hrd - * [nouvelle branche] git-annex -> wdrouge/git-annex - e5894a1..f5af709 master -> wdrouge/master - * [nouvelle branche] synced/git-annex -> wdrouge/synced/git-annex - * [nouvelle branche] synced/master -> wdrouge/synced/master -ok -pull origin -Depuis /home/hrd - + 93d883b...f5af709 git-annex -> origin/git-annex (mise à jour forcée) - e5894a1..f5af709 master -> origin/master - + c8c2481...f5af709 synced/git-annex -> origin/synced/git-annex (mise à jour forcée) - 1d2a028..ac708e3 synced/master -> origin/synced/master - * [nouvelle étiquette] should-be-fine-here -> should-be-fine-here - -Mise à jour f5af709..ac708e3 -Fast-forward - -→ a bunch of files - 621 files changed, 22 insertions(+), 599 deletions(-) - delete mode 120000 → the bunch of files…………… - … - delete mode 120000 org/gtd.org_archive -ok -pull laptop -Depuis /home/hrd - + 93d883b...f5af709 git-annex -> laptop/git-annex (mise à jour forcée) - + c8c2481...f5af709 synced/git-annex -> laptop/synced/git-annex (mise à jour forcée) - 1d2a028..ac708e3 synced/master -> laptop/synced/master - -Already up-to-date. -ok -push wdrouge -Counting objects: 6609, done. -Delta compression using up to 4 threads. -Compressing objects: 100% (3057/3057), done. -Writing objects: 100% (3331/3331), 511.27 KiB | 0 bytes/s, done. -Total 3331 (delta 2091), reused 0 (delta 0) -To /run/media/hrd/WD-rouge/annex/hrd - f5af709..16f17bf git-annex -> synced/git-annex - f5af709..ac708e3 master -> synced/master -ok -push origin -Counting objects: 6569, done. -Delta compression using up to 4 threads. -Compressing objects: 100% (3056/3056), done. -Writing objects: 100% (3330/3330), 511.05 KiB | 0 bytes/s, done. -Total 3330 (delta 2091), reused 0 (delta 0) -To /home/hrd/ - f5af709..16f17bf git-annex -> synced/git-annex -ok -push laptop -Everything up-to-date -ok -git annex sync 14.33s user 1.87s system 74% cpu 21.696 total -`````````````````` - -"""]] diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_2_f49e6f4016b3a6f918961a2412902e03._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_2_f49e6f4016b3a6f918961a2412902e03._comment deleted file mode 100644 index 277a72b63..000000000 --- a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_2_f49e6f4016b3a6f918961a2412902e03._comment +++ /dev/null @@ -1,12 +0,0 @@ -[[!comment format=mdwn - username="http://joeyh.name/" - ip="108.236.230.124" - subject="comment 2" - date="2014-03-10T17:11:41Z" - content=""" -Your laptop is in indirect mode, so we know that the only way files can be deleted by a merge is if a commit was made to git that deletes the files. - -My conclusion is that some repository, perhaps the usb drive, made a commit that deleted those files. You should be able to find this commit with `git log --stat`, and can just `git revert` it if you want to. - -So far, I don't see evidence of a bug. For all I know, you actually did delete the files on the usb drive, and that change got committed.. -"""]] diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_3_a234e4f58d2cc3b0110e4e65aceeb2c3._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_3_a234e4f58d2cc3b0110e4e65aceeb2c3._comment deleted file mode 100644 index edf2b26a8..000000000 --- a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_3_a234e4f58d2cc3b0110e4e65aceeb2c3._comment +++ /dev/null @@ -1,20 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawno-jcsScu4CK6k2QLZqxMros1PQHf1NQY" - nickname="Hugo" - subject="comment 3" - date="2014-03-13T14:36:20Z" - content=""" -> My conclusion is that some repository, perhaps the usb drive, made a commit that deleted those files. You should be able to find this commit with git log --stat, and can just git revert it if you want to. - -It would be surprising if I did that. - -Anyway, I was not able to find which commit deleted the ~600 files. I just decided to re-start completely with git annex :-/ - -The good thing is that I did not lose any file, so in that regard git annex is great ;^) - -However, one thing that is quite confusing to me is the way git annex [sync] works. Am I supposed to run git annex sync in every repository? Because if I just run it once in 1 repo, then I usually don't get all the syncing done. Maybe I just don't understand something. - -Thanks for replying, - -[sync]: http://git-annex.branchable.com/sync/ -"""]] diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_4_a01a867500fd94e6b317e74a0b0b1401._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_4_a01a867500fd94e6b317e74a0b0b1401._comment deleted file mode 100644 index 6c519e632..000000000 --- a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_4_a01a867500fd94e6b317e74a0b0b1401._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="http://joeyh.name/" - ip="209.250.56.154" - subject="comment 4" - date="2014-03-13T15:54:28Z" - content=""" -Did you run `git log --stat` and look for a commit that deleted a lot of files? -"""]] diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_5_b5d7fcd0dd707cd2b62d8b9eb2cae3f0._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_5_b5d7fcd0dd707cd2b62d8b9eb2cae3f0._comment deleted file mode 100644 index bffe9debd..000000000 --- a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_5_b5d7fcd0dd707cd2b62d8b9eb2cae3f0._comment +++ /dev/null @@ -1,11 +0,0 @@ -[[!comment format=mdwn - username="edward" - subject="Same problem, git revert worked, sort of" - date="2015-08-13T11:18:42Z" - content=""" -I had a similar problem. I ran `git annex sync` twice, once on the laptop, then on the external drive, lots of git annex symlinks disappeared from the laptop, the symlinks are still present on external drive checkout directory, but git says they were deleted, when I run `git status` it lists them as untracked files. I followed the advice and ran `git log --stat` to find the commit that removed the files. The commit message is \"git-annex in big portable USB drive\". I'm pretty sure that this is a commit from `git annex sync`. - -Running `git revert` worked on the laptop, but it fails external drive, it says \"error: The following untracked working tree files would be overwritten by merge\" and starts listing the missing symlinks. - -Both annex checkouts are set to indirect mode. The laptop preferred content is manual, the external drive is backup. I've run the assistant in the past, but not recently. I'm running Debian git-annex 5.20150727-2. Let me know if you need any more information. -"""]] diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_6_ccfa7150ee87a5ce5bc9189e3a0dcb86._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_6_ccfa7150ee87a5ce5bc9189e3a0dcb86._comment deleted file mode 100644 index bed21aedb..000000000 --- a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_6_ccfa7150ee87a5ce5bc9189e3a0dcb86._comment +++ /dev/null @@ -1,27 +0,0 @@ -[[!comment format=mdwn - username="edward" - subject="I've ended up with lots of staged deletes" - date="2015-08-27T08:29:55Z" - content=""" -I have the same problem with another annex. I ran the webapp using `git annex webapp` in the annex on my laptop hard drive. It seemed to update and sync with the annex on my external USB drive, but now when I run `git status` in the annex directory on the drive it has staged lots of deletes. I don't understand what is going on here. Both annexes are in indirect mode. - - On branch master - Your branch is behind 'origin/master' by 61 commits, and can be fast-forwarded. - (use \"git pull\" to update your local branch) - Changes to be committed: - (use \"git reset HEAD <file>...\" to unstage) - - deleted: 4angle_tech_ltd/032-570247_20150312-074413_30313.pdf - deleted: 4angle_tech_ltd/032-570247_20150312_09486613.pdf - deleted: android/RUU_PRIMO_U_ICS_40A_HTC_Europe_2.22.401.1_Radio_20.76.30.0835U_3831.19.00.120_release_273801_signed.exe - deleted: article/Fukuyama-End-of-history-article.pdf - deleted: article/The Selling of the Avocado - Health - The Atlantic.html - -The symlinks and the data are still on the disk, as is the data that the symlinks point to. - - $ ls 4angle_tech_ltd -l - total 8 - lrwxrwxrwx 1 edward edward 197 Mar 15 08:39 032-570247_20150312-074413_30313.pdf -> ../.git/annex/objects/qM/mj/SHA256E-s21598--efb39974c5253d8059f0fe991c1b76aba8455d8439eefd6cd8943503f85109c0.pdf/SHA256E-s21598--efb39974c5253d8059f0fe991c1b76aba8455d8439eefd6cd8943503f85109c0.pdf - lrwxrwxrwx 1 edward edward 197 Mar 15 08:39 032-570247_20150312_09486613.pdf -> ../.git/annex/objects/JX/XP/SHA256E-s93692--8e88ca5071bc2155acfe16a41c9c6b756fecc6515cfb7907105dd1a83e73f57a.pdf/SHA256E-s93692--8e88ca5071bc2155acfe16a41c9c6b756fecc6515cfb7907105dd1a83e73f57a.pdf - $ -"""]] diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_7_4616d3b3d7c5bc0ca76379185bb34d10._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_7_4616d3b3d7c5bc0ca76379185bb34d10._comment deleted file mode 100644 index e6d6ace9d..000000000 --- a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_7_4616d3b3d7c5bc0ca76379185bb34d10._comment +++ /dev/null @@ -1,50 +0,0 @@ -[[!comment format=mdwn - username="yminus" - subject="comment 7" - date="2015-12-10T22:25:26Z" - content=""" -I have the same problem as the initial reporter. - -USB drive is FAT32 in direct mode - -laptop is ext4 in indirect mode - -nas is ext4 in indirect mode - -Syncing nas with laptop and vice versa works with no problems. - -But as soon as I sync with USB drive it behaves like all commits on laptop and nas that happened since the last sync are reverted. - -I can recover the files on laptop and nas by ```git reset --hard origin/master``` and ```git reset --hard origin/synced/master``` on laptop or nas. - -However, I cannot reset master and synced/master on the USB drive (error is \"fatal: This operation must be run in a work tree\"). - -This is the tree as seen from the on laptop after syncing and resetting as described above: - - * 9bdc037 (n900/synced/master, n900/master) merge refs/heads/synced/master ### <--- THIS IS THE STATE WHEN SYNCING WITH USB DRIVE all added files are deleted - |\ - | * 1236008 (HEAD -> master, origin/synced/master, origin/master, nas/synced/master, nas/master, synced/master) ADDED FILES ### <--- THIS IS THE LAST GOOD STATE - | * 17c4f54 ADDED FILES - | * 364d525 Merge remote-tracking branch 'refs/remotes/origin/master' - | |\ - | | * c18f170 ADDED FILES - | | * 9dd5668 ADDED FILES - | * | c3280fc ADDED FILES - | * | 2babe80 ADDED FILES - | * | b964e29 ADDED FILES - | * | 03f3bd1 ADDED FILES - | * | 010a469 ADDED FILES - | * | 8acf199 ADDED FILES - | * | f2477bc Merge remote-tracking branch 'refs/remotes/origin/master' - | |\ \ - | | |/ - | | * 121ffd1 ADDED FILES - * | | dc88b8a (n900/annex/direct/master) git-annex in lars@lars-laptop:/run/media/lars/Nokia N900/.sounds/Musik ### <--- THIS IS THE CURRENT STATE ON THE USB DRIVE - |/ / - * - -n900 is the USB drive -nas and origin are both the same - -How can I sync my USB drive without loosing my last commits? -"""]] diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_8_7b89c224ab6f79d406785fe751c241b6._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_8_7b89c224ab6f79d406785fe751c241b6._comment deleted file mode 100644 index 943b9718e..000000000 --- a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_8_7b89c224ab6f79d406785fe751c241b6._comment +++ /dev/null @@ -1,77 +0,0 @@ -[[!comment format=mdwn - username="yminus" - subject="comment 8" - date="2015-12-13T22:55:15Z" - content=""" -I think the problem in my case is that I had special characters in some file names which fat does not support. - -I tried to recover the git annex repo in direct mode using these steps: -<pre> -git push --force n900 master -git checkout synced/master -git push --force n900 synced/master -git checkout master -git annex unlock flac/Type_O_Negative/2003_Life_Is_Killing_Me/ -mv flac/Type_O_Negative/2003_Life_Is_Killing_Me/03.Less_Than_Zero_\(\<0\).flac flac/Type_O_Negative/2003_Life_Is_Killing_Me/03.Less_Than_Zero.flac -git annex add flac/ -git commit -m \"Work around broken file systems\" -git push --force n900 master -git checkout synced/master -git push --force n900 synced/master -git checkout master -git annex sync n900 -</pre> - -But now the last git annex sync creates a merge commit which only contains \"variants\" of the renamed files: - -<pre> - Merge remote-tracking branch 'refs/remotes/origin/synced/master' into annex/direct/master - - # Conflicts: - # flac/Type_O_Negative/2003_Life_Is_Killing_Me/03.Less_Than_Zero.flac - # mp3/Type_O_Negative/2003_Life_Is_Killing_Me/03.Less_Than_Zero.mp3 - - flac/Type_O_Negative/2003_Life_Is_Killing_Me/03.Less_Than_Zero.variant-6467.flac -index 0000000,c33ca87..c33ca87 -mode 000000,120000..120000 - - mp3/Type_O_Negative/2003_Life_Is_Killing_Me/03.Less_Than_Zero.variant-562b.mp3 -index 0000000,a247fc6..a247fc6 -mode 000000,120000..120000 -</pre> - -So the repo on n900 still does not contain all the files added since the last sync (git annex get fails for those files). At least now the sync does not delete files in my laptop repo any more. - -This is the current state: - -<pre> -* 44dd9a8 (n900/annex/direct/master) Merge remote-tracking branch 'refs/remotes/origin/synced/master' into annex/direct/master -|\ -| * 21df034 (HEAD -> master, tag: before_syncing_n900, nas/synced/master, n900/synced/master, n900/master, synced/master) Merge remote-tracking branch 'refs/remotes/nas/master' -| |\ -| | * 4f61c44 (nas/master) Work around broken file systems -| | * 85ab30f ADDED FILES -| * | 92bc06e Work around broken file systmes (mp3) -| |/ -* | a945a24 merge refs/heads/synced/master -|\ \ -| |/ -| * 1236008 (origin/synced/master, origin/master) ADDED FILES -| * 17c4f54 ADDED FILES -| * 364d525 Merge remote-tracking branch 'refs/remotes/origin/master' -| |\ -| | * c18f170 ADDED FILES -| | * 9dd5668 ADDED FILES -| * | c3280fc ADDED FILES -| * | 2babe80 ADDED FILES -| * | b964e29 ADDED FILES -| * | 03f3bd1 ADDED FILES -| * | 010a469 ADDED FILES -| * | 8acf199 ADDED FILES -| * | f2477bc Merge remote-tracking branch 'refs/remotes/origin/master' -| |\ \ -| | |/ -| | * 121ffd1 ADDED FILES -* | | dc88b8a git-annex in lars@lars-laptop:/run/media/lars/Nokia N900/.sounds/Musik -</pre> -"""]] diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_9_6328cbc42f5938a766ff5adda3da03b7._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_9_6328cbc42f5938a766ff5adda3da03b7._comment deleted file mode 100644 index e301c63b6..000000000 --- a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_9_6328cbc42f5938a766ff5adda3da03b7._comment +++ /dev/null @@ -1,7 +0,0 @@ -[[!comment format=mdwn - username="spwhitton" - subject="comment 9" - date="2016-05-02T19:26:47Z" - content=""" -I appreciate that Joey has closed this as insufficiently detailed, and I'm not able to reliably reproduce the issue either, but I have experienced a similar issue today where a sync wants to delete all of the files in my repository and I have no reason to believe that I actually deleted them all. The common factor here is that we're all trying to sync to FAT devices. Git is very slow on FAT flash drives, and perhaps at some point it thinks the files aren't there during a sync. I'm going to stop using git annex with FAT flash drives. -"""]] |