diff options
author | 2014-01-06 17:16:08 -0400 | |
---|---|---|
committer | 2014-01-06 17:16:08 -0400 | |
commit | 7f86204a7b768e0c8b5a717c9d15ee426c569b9c (patch) | |
tree | 6e5afb5bacaa4f4317eb2f955269589d07c273a4 | |
parent | aa34e4147975ed47b1cc85086ecbd2c4b86e99e2 (diff) | |
parent | fe3bedcb60abcb406265917d1ddd537d490b1db3 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
3 files changed, 67 insertions, 0 deletions
diff --git a/doc/forum/workspace.xml_file_disappeared__44___broken_symlink_showed_up/comment_1_00b084f9786de6516f46065c0cb00e79._comment b/doc/forum/workspace.xml_file_disappeared__44___broken_symlink_showed_up/comment_1_00b084f9786de6516f46065c0cb00e79._comment new file mode 100644 index 000000000..32e4972ca --- /dev/null +++ b/doc/forum/workspace.xml_file_disappeared__44___broken_symlink_showed_up/comment_1_00b084f9786de6516f46065c0cb00e79._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.35" + subject="comment 1" + date="2014-01-06T18:38:51Z" + content=""" +If the file was modified, git-annex should notice and add the new version. So the mere act of modifying the file does not explain how you ended up with a symlink to the old version of the file. Although it does explain why git-annex log would show that the old version of the file had been deleted. + +What does `git log` say when run on the workspace.xml file? + +"""]] diff --git a/doc/forum/workspace.xml_file_disappeared__44___broken_symlink_showed_up/comment_2_138499b36d28c5e267b4aad8792dc87e._comment b/doc/forum/workspace.xml_file_disappeared__44___broken_symlink_showed_up/comment_2_138499b36d28c5e267b4aad8792dc87e._comment new file mode 100644 index 000000000..1407a8ad3 --- /dev/null +++ b/doc/forum/workspace.xml_file_disappeared__44___broken_symlink_showed_up/comment_2_138499b36d28c5e267b4aad8792dc87e._comment @@ -0,0 +1,48 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkipQLNyt8RHREHpg2k5wdYeRSCCvSNSBg" + nickname="Tim" + subject="git log for workspace.xml" + date="2014-01-06T19:17:13Z" + content=""" +git log on the file gives a ton of output, is this what you need? + +commit 93157022d8ee57097db29fcc669e99e218b54657 +Author: Tim Mattison <tim.mattison@email.com> +Date: Fri Jan 3 17:08:03 2014 -0500 + +commit 04dab5520f33140a21882515b4036f71729a5f89 +Author: Tim Mattison <tim.mattison@email.com> +Date: Fri Jan 3 17:06:54 2014 -0500 + +commit b75be90bf91c9f9314e567d5a28e4497070de9af +Author: Tim Mattison <tim.mattison@email.com> +Date: Fri Jan 3 16:58:24 2014 -0500 + +commit 4045b2d7a71b9ab692c20eeab73bf196a280940d +Author: Tim Mattison <tim.mattison@email.com> +Date: Fri Jan 3 16:58:05 2014 -0500 + +commit 25de8a1fcd5cce53b8077443dccba1591255431f +Author: Tim Mattison <tim.mattison@email.com> +Date: Fri Jan 3 16:57:32 2014 -0500 + +commit dd118ae88cdccb5a7d68a7ae14033304865cfc4e +Author: Tim Mattison <tim.mattison@email.com> +Date: Fri Jan 3 16:53:37 2014 -0500 + +commit eaa5f85b7feed8ba17e3874763b4d7aa6e05b5c1 +Author: Tim Mattison <tim.mattison@email.com> +Date: Fri Jan 3 16:53:23 2014 -0500 + +commit 4d310d7d16234a1a6bcf0f14ebae232c57d904a7 +Author: Tim Mattison <tim.mattison@email.com> +Date: Fri Jan 3 16:52:42 2014 -0500 + +commit 2487ae7f99c7b81c1648fdc88d0b39a1cf6e4d03 +Author: Tim Mattison <tim.mattison@email.com> +Date: Fri Jan 3 16:52:21 2014 -0500 + +commit 9e0040311c43e6e1f04ff3b8fdd3ac5570c8f2d1 +Author: Tim Mattison <tim.mattison@email.com> +Date: Fri Jan 3 16:51:54 2014 -0500 +"""]] diff --git a/doc/forum/workspace.xml_file_disappeared__44___broken_symlink_showed_up/comment_3_6c59c494b563e56d061417eb2216bb19._comment b/doc/forum/workspace.xml_file_disappeared__44___broken_symlink_showed_up/comment_3_6c59c494b563e56d061417eb2216bb19._comment new file mode 100644 index 000000000..f31e7cf4d --- /dev/null +++ b/doc/forum/workspace.xml_file_disappeared__44___broken_symlink_showed_up/comment_3_6c59c494b563e56d061417eb2216bb19._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkipQLNyt8RHREHpg2k5wdYeRSCCvSNSBg" + nickname="Tim" + subject="Formatting!" + date="2014-01-06T19:22:36Z" + content=""" +I swear, some day I'll get the formatting correct. Sorry! +"""]] |