diff --git a/doc/bugs/Assistant_merge_loop/comment_6_e7b6ecdd7e2b0222ea0baa0ed770e66d._comment b/doc/bugs/Assistant_merge_loop/comment_6_e7b6ecdd7e2b0222ea0baa0ed770e66d._comment new file mode 100644 index 0000000000..e408643cad --- /dev/null +++ b/doc/bugs/Assistant_merge_loop/comment_6_e7b6ecdd7e2b0222ea0baa0ed770e66d._comment @@ -0,0 +1,80 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmN5jDf53oRJZsTo8Ahj2uXzCzq6HcvEro" + nickname="Gregory" + subject="confirmed?" + date="2014-07-15T01:29:00Z" + content=""" +I seem to be getting this behavior, in tandem with the [bad merge commit deleting all files](http://git-annex.branchable.com/bugs/bad_merge_commit_deleting_all_files/) on + + git-annex version: 5.20140709-gf15d2aa + build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash + key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL + remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external + local repository version: unknown + supported repository version: 5 + upgrade supported from repository versions: 0 1 2 4 + +Here is my log over the past couple weeks when I basically made no changes to the filesystem. + +git log --oneline --decorate --color --graph + +
+* b304ad7 (HEAD, origin/synced/master, origin/master, origin/HEAD, master) +* 568cf6c merge refs/remotes/diskb/synced/master +* 5e426d0 merge refs/remotes/diskb/synced/master +* b2fa076 merge refs/remotes/diskb/synced/master +* b66a37d merge refs/remotes/diskb/synced/master +|\ +* | 910cba5 merge refs/remotes/diskb/synced/master +|/ +* 60736c3 merge refs/remotes/diskb/synced/master +* a957439 merge refs/remotes/diskb/synced/master +|\ +* \ 5c135c0 merge refs/remotes/diskb/synced/master +|\ \ +| |/ +* | 52d8b66 merge refs/heads/synced/master +|\ \ +* | | d77f3a2 merge refs/remotes/diskb/synced/master +| |/ +|/| +* | 03bb56a merge refs/remotes/diskb/synced/master +|\ \ +* \ \ bb000db merge refs/heads/synced/master +|\ \ \ +| |/ / +|/| / +| |/ +* | 3bc8520 merge refs/heads/synced/master +|/ +* 1c3ee7e +* d3b096a merge refs/remotes/diskb/synced/master +|\ +* \ 0fa0f6d merge refs/heads/synced/master +|\ \ +| |/ +* | 173592c merge refs/remotes/diskb/synced/master +|\ \ +| |/ +* | 3dd8086 merge refs/remotes/diskb/synced/master +|\ \ +| |/ +* | 68be2a1 merge refs/heads/synced/master +|\ \ +| |/ +* | bb304f4 merge refs/remotes/diskb/synced/master +|\ \ +| |/ +|/| +* | 1c9a2cd +* | 298b362 merge refs/heads/synced/master +|/ +* 4c23257 merge refs/remotes/diskb/synced/master +|\ +* | b709997 merge refs/remotes/diskb/synced/master +|/ +* 215f061 merge refs/remotes/diskb/synced/master +|\ +* \ e0f75b4 merge refs/heads/synced/master ++"""]] diff --git a/doc/bugs/using_gpg_encryption_with_multiple_keys_fails/comment_2_51855f5bb857e1b6bc5531cdd7073c31._comment b/doc/bugs/using_gpg_encryption_with_multiple_keys_fails/comment_2_51855f5bb857e1b6bc5531cdd7073c31._comment new file mode 100644 index 0000000000..df07fd04a7 --- /dev/null +++ b/doc/bugs/using_gpg_encryption_with_multiple_keys_fails/comment_2_51855f5bb857e1b6bc5531cdd7073c31._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="lex" + ip="17.199.80.21" + subject="comment 2" + date="2014-07-14T22:21:32Z" + content=""" +ah. It's bailing due to the first key requiring passphrase, and since it aborts there it never tries the second so the whole thing fails. + +okay thanks for the link. +"""]]