diff options
author | Joey Hess <joey@kitenet.net> | 2013-12-31 15:01:47 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-12-31 15:01:47 -0400 |
commit | c01f6855acfeaac1e449da0f308303b2ea6eb9db (patch) | |
tree | 6a9ed288d9ab2a5f9413c85415227301a4fec804 | |
parent | 63948363a6def3639b6341f6bc083194c8bc6434 (diff) | |
parent | 0b1c21908b8ed04884af0c0183d57a874b9c9a80 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
2 files changed, 32 insertions, 0 deletions
diff --git a/doc/bugs/Assistant_from_standalone_5.20131230_64bit_crashes_on_startup/comment_1_56befc288c40e062e086d93d26064342._comment b/doc/bugs/Assistant_from_standalone_5.20131230_64bit_crashes_on_startup/comment_1_56befc288c40e062e086d93d26064342._comment new file mode 100644 index 000000000..951d2687a --- /dev/null +++ b/doc/bugs/Assistant_from_standalone_5.20131230_64bit_crashes_on_startup/comment_1_56befc288c40e062e086d93d26064342._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.227" + subject="comment 1" + date="2013-12-31T18:55:36Z" + content=""" +You seem to show `git-annex version` being run without crashing, so it does not seem to crash on startup generally. + +Also, this build of git-annex is not linked to libgcc at all. + +Also, git-annex seems to start your web browser. + +So, it seems more likely that your web browser is crashing than that git-annex is crashing. The web browser crash may be taking out git-annex in some way. +"""]] diff --git a/doc/forum/Git_Annex_Sync_Delinks_Files/comment_2_a625e7d88e321532ace103548b31b67b._comment b/doc/forum/Git_Annex_Sync_Delinks_Files/comment_2_a625e7d88e321532ace103548b31b67b._comment new file mode 100644 index 000000000..9dd931053 --- /dev/null +++ b/doc/forum/Git_Annex_Sync_Delinks_Files/comment_2_a625e7d88e321532ace103548b31b67b._comment @@ -0,0 +1,18 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawk_W9oOMDiBaU_xLIbeaTF8wW2wJzJ7bfw" + nickname="Christopher" + subject="comment 2" + date="2013-12-31T18:56:58Z" + content=""" +I am not in direct mode. +I don't believe I did anything in the repo. I reset back to a commit and look in the folder and it's all symlinks and nothing in git status says anything about it. + +Then I run `git annex sync` and one of the thing it does is \"Checking out files\" which takes a long time, since it seems to be copying the data into the working directory and commiting it. +I don't know why it's decided to do that. + +What steps can I take to either get you more information or fix things? + +Perhaps relatedly, if I make a mistake with git-annex, is git-reset master and git-reset synced/master the right approach? +Are there other things I should try, etc? + +"""]] |