Merge branch 'master' of ssh://git-annex.branchable.com

2 files changed, 93 insertions, 0 deletions

diff --git a/doc/bugs/fsck_should_double-check_when_a_content-check_fails/comment_4_36a70d5a378983a76fcdbb7fba044044._comment b/doc/bugs/fsck_should_double-check_when_a_content-check_fails/comment_4_36a70d5a378983a76fcdbb7fba044044._comment
new file mode 100644
index 000000000..64df24bdb
--- /dev/null
+++ b/doc/bugs/fsck_should_double-check_when_a_content-check_fails/comment_4_36a70d5a378983a76fcdbb7fba044044._comment
@@ -0,0 +1,32 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkHDm_DOFRcHYebCnnYKKyIwiPD4iOiiIU"
+ nickname="Jörn"
+ subject="comment 4"
+ date="2013-01-14T20:04:48Z"
+ content="""
+On the internal disk some files match, others don't:
+
+     42c95aee60c41157ee6d092eeea7fab73dff7b45a6e16ba77a02e2a6fec01c15  SHA256-s1099424853--42c95aee60c41157ee6d092eeea7fab73dff7b45a6e16ba77a02e2a6fec01c15
+     44c4d3b0f29d86597ae09cf52563e0a2adec7074f5359901fde8dbf88f9bc8ad  SHA256-s1173029201--bb981fddd750db1255cc1fda1f9612250f766e4da946eac4c294d8071196615c
+     a9d804fe633ae69d0c926dea41059c211f78cf891abfa275c579bcc8e12fa700  SHA256-s1363601770--a9d804fe633ae69d0c926dea41059c211f78cf891abfa275c579bcc8e12fa700
+     bac5f30b696b643c76a456e3018214ce64be7d289afaac96a7fdba03eccf73fd  SHA256-s1422005768--5754211ac3e7e6314de9aa34f7b1cfd3c9aed432f52b26189c4587dc505a30e8
+     be953e962d9c6a2699f361e468023aae34b1f7c66ad93852d8f88846b60ecbcc  SHA256-s1424026123--258dbe5704a46ecd3190d278efdd2adfeee9ad81843bfaa0ed7adbc10ccd5362
+     b9f06383c76a0161312aaf6298eb764dbfb8e1e51555ec06d8c85c9f5df9fe20  SHA256-s1448369674--a703dfd46c147396def6e1db22c7917dbdf010658aa32df1cf598e37a04d5897
+     e2d748ee5c5098316bbe20c3f771f7f552b07c394a1e9932cba2a90883b6fb5c  SHA256-s1480008949--505c7d2685290069140b2f03fa72a5b5e3f59c14961c60c5fd6532be05ad1c84
+     ac0d49461ca67ca2de0588491c39089634ae194870594dd869fbc84d42831baa  SHA256-s1489602933--f3ff3fc71b4f5493db476f29f373a4b3bf8808e9a7487589fee632ea58a415af
+     b9b1d133772c88a1c5f856e2d4bcb696a453c795337b9f97cfa4c00876f49b88  SHA256-s1512599506--78dc0bdf0b4e382283a770a36c7f699c83611a0436059e6bb44c8e94d26cca5f
+     497af65e2d400e5651d9b850bc5efbaa006cec08f3f0dfce5d09b8e3f994a80b  SHA256-s1524648153--85548bcb693491eeae1d1315a6037d5a9a15d2a10066f04f6e7ce75b6eb1ca47
+     cb793e7ac6df827e96f7dfa34a10f13a899140372c4db58b08650314596d30fa  SHA256-s1541427964--16b8f7d5e5e12af88e947b26ca4d38d6b6692de92a77d9ffef0c8c1d560db727
+     27ea446f928239ade9c3c1f38119fa38da50a74036f9987d57cce3b52ae632e9  SHA256-s1561020163--cfce86c309d16af772e68527ba365ceac5db447d5bbfc335e063a2a4e9d513d6
+     940d2c7ff3bde5662d71a1a463f6949c6dd6cf244d43ab7d48014a10d0fa5d6a  SHA256-s1562397113--a057d447b5b32d2f1a440247d9dc3c3ca697798d73dd740670a3033dd0fcbb68
+     [...]
+
+
+On the usb drive, hashes match:
+
+     [joern@heracles bad]$ sha256sum *
+     e306e07a09af9be9a974632c777935ddd0f5333b603b5f205dba03753619d682  SHA256-s1564783770--e306e07a09af9be9a974632c777935ddd0f5333b603b5f205dba03753619d682
+     8fe78a325a08099e56df44ff46d482607723dfc9402bcd8f4850907327603f05  SHA256-s207925248--8fe78a325a08099e56df44ff46d482607723dfc9402bcd8f4850907327603f05
+     8823bd4ccf5f6ff2fe0976de6a856490ef3de0ab1c1e128bde770b732e86d94c  SHA256-s923668098--8823bd4ccf5f6ff2fe0976de6a856490ef3de0ab1c1e128bde770b732e86d94c
+
+"""]]
diff --git a/doc/bugs/three_way_sync_via_S3_and_Jabber/comment_5_0b0d829ccd255be0177ae9d8f6b10e63._comment b/doc/bugs/three_way_sync_via_S3_and_Jabber/comment_5_0b0d829ccd255be0177ae9d8f6b10e63._comment
new file mode 100644
index 000000000..045139544
--- /dev/null
+++ b/doc/bugs/three_way_sync_via_S3_and_Jabber/comment_5_0b0d829ccd255be0177ae9d8f6b10e63._comment
@@ -0,0 +1,61 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmhjlfoU21OiXKH_MXw75Uq5EsX7LJW5p0"
+ nickname="Ian"
+ subject="comment 5"
+ date="2013-01-14T20:04:02Z"
+ content="""
+Here is the result of running `echo Foo > ~/Desktop/annex/dagon2.txt` on dagon.
+
+In dagon's daemon.log:
+<pre>
+add dagon2.txt (checksum...) (Recording state in git...)
+(Recording state in git...)
+Already up-to-date.
+To xmpp::ian.james.campbell@gmail.com
+   0bf7dc2..0182e26  git-annex -> refs/synced/54f6febc-4791-11e2-952f-13bd7a1c79f1/git-annex
+   c1e1f70..2711f11  master -> refs/synced/54f6febc-4791-11e2-952f-13bd7a1c79f1/master
+(merging refs/synced/1167ef76-4791-11e2-9bfe-4319f44b8a5f/git-annex into git-annex...)
+Already up-to-date.
+</pre>
+
+Nothing appeared in zakaz's log. As I mentioned in the previous comment hastur doesn't seem to have a log (should this worry me?).
+
+The new file appeared on dagon and hastur but not zakaz (not even as a broken link).
+
+I tried a couple more times (dagon3 and dagon4) with the same effect.
+
+Since zakaz now appears to be the host which is playing up I then tried `echo Foo > zakaz2.2txt` on zakaz.
+
+The log on zakaz said:
+<pre>
+add zakaz2.2txt (checksum...) gpg: cannot open tty `/dev/tty': No such device or address
+gpg: cannot open tty `/dev/tty': No such device or address
+(Recording state in git...)
+(Recording state in git...)
+gpg: cannot open tty `/dev/tty': No such device or address
+gpg: cannot open tty `/dev/tty': No such device or address
+</pre>
+
+and dagon:
+<pre>
+(merging refs/synced/552d29fe-4a86-11e2-819a-9f61585ee7a2/git-annex into git-annex...)
+(Recording state in git...)
+Merge made by the 'recursive' strategy.
+ zakaz2.2txt |    1 +
+ 1 file changed, 1 insertion(+)
+ create mode 120000 zakaz2.2txt
+(Recording state in git...)
+# On branch master
+nothing to commit (working directory clean)
+(merging refs/synced/1167ef76-4791-11e2-9bfe-4319f44b8a5f/git-annex into git-annex...)
+(Recording state in git...)
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Already up-to-date.
+To xmpp::ian.james.campbell@gmail.com
+   d220ce6..4e8647f  git-annex -> refs/synced/54f6febc-4791-11e2-952f-13bd7a1c79f1/git-annex
+   b2a84e4..ef0a200  master -> refs/synced/54f6febc-4791-11e2-952f-13bd7a1c79f1/master
+</pre>
+
+However zakaz2.2txt is a broken symlink on both hastur and dagon.
+"""]]