diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-07-30 16:08:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-30 16:08:43 -0400 |
| commit | ded450279ff7edea91489bc1dd197fb30a744066 (patch) | |
| tree | 60c6c813ebda4ced53afacad9bdd54e542ad93ff | |
| parent | 043672e11448516b70c0bea789f94fd3d5e16910 (diff) | |
| parent | 45b50c63af295630e01f93cee99a0a63ef07f287 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
3 files changed, 26 insertions, 0 deletions
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 000000000..f3e8ec690 --- /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` +"""]] 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 000000000..6af5a06a6 --- /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. +"""]] 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 000000000..b608efdbe --- /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. +"""]] |