From 3c8a804df73d679c40777329ca21d7891ea80b40 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 30 Jul 2013 19:17:11 +0000 Subject: [PATCH 1/3] Added a comment: re: workaround --- .../comment_1_1a0b964f93c753838d6ccbdc8f79b39e._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_1_1a0b964f93c753838d6ccbdc8f79b39e._comment diff --git a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_1_1a0b964f93c753838d6ccbdc8f79b39e._comment b/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_1_1a0b964f93c753838d6ccbdc8f79b39e._comment new file mode 100644 index 0000000000..f3e8ec690b --- /dev/null +++ b/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_1_1a0b964f93c753838d6ccbdc8f79b39e._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.154.0.21" + subject="re: workaround" + date="2013-07-30T19:17:11Z" + content=""" +The problem with manually merging the branches and not using sync is that the file mappings get out of date. You should be able to correct them by running `git annex fsck` +"""]] From fc781a8650b05fa931bea465285c3b3fdce2d5a4 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 30 Jul 2013 19:55:04 +0000 Subject: [PATCH 2/3] Added a comment --- .../comment_2_d22dcd7f95c5dc1c381c3c746781efce._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_2_d22dcd7f95c5dc1c381c3c746781efce._comment diff --git a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_2_d22dcd7f95c5dc1c381c3c746781efce._comment b/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_2_d22dcd7f95c5dc1c381c3c746781efce._comment new file mode 100644 index 0000000000..6af5a06a6f --- /dev/null +++ b/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_2_d22dcd7f95c5dc1c381c3c746781efce._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.154.0.21" + subject="comment 2" + date="2013-07-30T19:55:04Z" + content=""" +This reversion affects direct mode on FAT, not just on Windows! It was probably caused by commit ecdfa40cbea1ae213ab84913d8f011027967a610 or commit ae341c1a37eecc1724517e3e025d144badb5abfe. Investigating. +"""]] From 5474f655ee179213873d51fd6e54a1073146b37d Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 30 Jul 2013 20:07:09 +0000 Subject: [PATCH 3/3] Added a comment --- ...comment_3_a25140eb90f6b24c1a3ca39c901694e2._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_3_a25140eb90f6b24c1a3ca39c901694e2._comment diff --git a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_3_a25140eb90f6b24c1a3ca39c901694e2._comment b/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_3_a25140eb90f6b24c1a3ca39c901694e2._comment new file mode 100644 index 0000000000..b608efdbef --- /dev/null +++ b/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_3_a25140eb90f6b24c1a3ca39c901694e2._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.154.0.21" + subject="comment 3" + date="2013-07-30T20:07:09Z" + content=""" +Yeah, I inverted some logic. This also affects, for example, git-annex on Android. Sigh. Sorry about this. + +I suppose that, if you run into this bug, the best way to fix up after it is to `git-revert -n` the bad commit that sync made. Then run `git annex sync` with the fixed git-annex to commit the reversion. +"""]]