diff options
9 files changed, 110 insertions, 0 deletions
diff --git a/doc/bugs/Commiting_Files_Containing_Non_Ascii_Char_on_OS_X_.mdwn b/doc/bugs/Commiting_Files_Containing_Non_Ascii_Char_on_OS_X_.mdwn new file mode 100644 index 000000000..f83a8e410 --- /dev/null +++ b/doc/bugs/Commiting_Files_Containing_Non_Ascii_Char_on_OS_X_.mdwn @@ -0,0 +1,44 @@ +### Please describe the problem. + +Any file containing non ascii chars either won't get commited by the webapp or when clone of that repo is made they are shown as deleted in git status but the files are there. + +you can not commit them neither, + + git commit -m 'foo' + +or + + git annex sync + +will get them to commit trying to reset the state using, + + git checkout master + +or + + git clean -f + +won't fix the issue. till the issue is fixed sync does not work from the command line since there are changes. Temporarily running assistant in the directory does fix the problem but every now and then it pops again. + +Also moving any symlinks around containing non ascii chars also causes the same issue. git annex won't add the moved symlinks git annex fix or git annex add won't add them git annex sync also skips them again the only solution is to either run the assistant or restart it if it is running. + +### What steps will reproduce the problem? + +Adding any file with a non ascii char on OS X (10.9). + + +### What version of git-annex are you using? On what operating system? + +git-annex version: 5.20140421-gc34a665 + +### Please provide any additional information below. + +Also another thing I noticed is that same file names same repo will clone fine on Linux no errors this only happens on OS X. + +[[!format sh """ +# If you can, paste a complete transcript of the problem occurring here. +# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log + + +# End of transcript or log. +"""]] diff --git a/doc/bugs/ssh-askpass_locks_me_out_of_x_console/comment_4_33a367dbeb5c7bf8692a414f20d8de69._comment b/doc/bugs/ssh-askpass_locks_me_out_of_x_console/comment_4_33a367dbeb5c7bf8692a414f20d8de69._comment new file mode 100644 index 000000000..aaddb60be --- /dev/null +++ b/doc/bugs/ssh-askpass_locks_me_out_of_x_console/comment_4_33a367dbeb5c7bf8692a414f20d8de69._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="108.236.230.124" + subject="comment 4" + date="2014-05-15T19:22:21Z" + content=""" +The webapp now has a dropdown menu, which defaults to using a password you enter in the form. It still has the option to use an already configured ssh key, but this won't just happen without the user explicitly choosing it. + +I think that's enough to close this bug, so will do so in the sshpassword branch. +"""]] diff --git a/doc/forum/Workflow_for_adding_files/comment_1_a60dae97db827bc641d6256d1f382b5f._comment b/doc/forum/Workflow_for_adding_files/comment_1_a60dae97db827bc641d6256d1f382b5f._comment new file mode 100644 index 000000000..9774e69bf --- /dev/null +++ b/doc/forum/Workflow_for_adding_files/comment_1_a60dae97db827bc641d6256d1f382b5f._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnJO6OKamxo1HDLwdV-W3KV4GhJ5Qitl9M" + nickname="Frederik" + subject="comment 1" + date="2014-05-15T00:57:23Z" + content=""" +Check the description for manual out on [[http://git-annex.branchable.com/preferred_content/standard_groups/]]. I believe that's what you'll need. +"""]] diff --git a/doc/forum/remembering_state/comment_2_1b02d3713a2986bc027d166589a11c3f._comment b/doc/forum/remembering_state/comment_2_1b02d3713a2986bc027d166589a11c3f._comment new file mode 100644 index 000000000..3c3f393a6 --- /dev/null +++ b/doc/forum/remembering_state/comment_2_1b02d3713a2986bc027d166589a11c3f._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs" + nickname="Xinruo" + subject="comment 2" + date="2014-05-15T02:07:06Z" + content=""" +I think a better solution is to use http://git-annex.branchable.com/tips/metadata_driven_views/ +You can tag the files as favorites, then use get --metadata tag=favorites to get only favorites files. +"""]] diff --git a/doc/sync/comment_13_690f66be9cefe28844d8df653b7a0331._comment b/doc/sync/comment_13_690f66be9cefe28844d8df653b7a0331._comment new file mode 100644 index 000000000..08ea5e843 --- /dev/null +++ b/doc/sync/comment_13_690f66be9cefe28844d8df653b7a0331._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="zardoz" + ip="134.147.14.84" + subject="comment 13" + date="2014-05-15T08:28:09Z" + content=""" +I agree with mshri. It’s confusing to have every local branch wind up on every remote (and it hinders «git annex unused»). + +I tried working around this by just including relevant branches in the «fetch» refspec, but this will only work until another remote pushes the branches again. +"""]] diff --git a/doc/sync/comment_14_db342785a4dade30b5b75cb95031bed1._comment b/doc/sync/comment_14_db342785a4dade30b5b75cb95031bed1._comment new file mode 100644 index 000000000..66798dbb1 --- /dev/null +++ b/doc/sync/comment_14_db342785a4dade30b5b75cb95031bed1._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="zardoz" + ip="134.147.14.84" + subject="comment 14" + date="2014-05-15T08:58:26Z" + content=""" +Added a wishlist item <http://git-annex.branchable.com/todo/Allow_syncing_only_selected_branches/> +"""]] diff --git a/doc/todo/Allow_syncing_only_selected_branches.mdwn b/doc/todo/Allow_syncing_only_selected_branches.mdwn new file mode 100644 index 000000000..3f4d4db70 --- /dev/null +++ b/doc/todo/Allow_syncing_only_selected_branches.mdwn @@ -0,0 +1,6 @@ +It seems that currently, syncing will result in every branch winding +up everywhere within the network of git annex nodes. It would be great +if one could keep some branches purely local. + +The «fetch» part of «sync» seems to respect the fetch refspec in the +git config, but the push part seems to always push everything. diff --git a/doc/todo/Enhancement:_git_annex_whereis_KEY/comment_2_4189d9e91208a59381100613e254e731._comment b/doc/todo/Enhancement:_git_annex_whereis_KEY/comment_2_4189d9e91208a59381100613e254e731._comment new file mode 100644 index 000000000..e5645884e --- /dev/null +++ b/doc/todo/Enhancement:_git_annex_whereis_KEY/comment_2_4189d9e91208a59381100613e254e731._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="zardoz" + ip="134.147.14.84" + subject="comment 2" + date="2014-05-15T13:03:47Z" + content=""" +Okay, I suppose one way of doing a search that works like that would do a «git log --stat -S'KEY' $commit», starting with HEAD and then walking the parents. +"""]] diff --git a/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn b/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn new file mode 100644 index 000000000..0224733c3 --- /dev/null +++ b/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn @@ -0,0 +1,7 @@ +The automatic conflict resolution currently seems to only work within +the context of sync, when merging «synced/foo» into «foo». It would be +convenient if this functionality were exposed for manual merges +between local branches. + +E.g., one might invoke «git annex merge» or «git annex autoresolve» +after «git merge» when conflicts are found. |