mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2013-06-11 10:42:49 -04:00
commit 47589a29cf
11 changed files with 141 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/bugs/Glacier_remote_uploads_duplicates/comment_7_e96187bad3dae2f5f95118f6df87a1ec._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 7"
date="2013-06-11T14:38:19Z"
content="""
Ok, I've merged the glacier branch into master. I would still be happy to see some testing of this before my next release (in a week).
I guess I'll close this bug report. There are certianly still problems that can happen if there are multiple repositories all writing to glacier independently. Seems to me that one good way to deal with this is to set up a single remote that is configured to be a gateway to glacier.
"""]]

8
doc/bugs/Move_ssh_config_to___126____47__ssh__47__git-annex__47__config.mdwn Normal file
View file

@ -0,0 +1,8 @@
### Please describe the problem.
Instead of storing config for each remote in ~/.ssh/config, which mixes the user own config with that of git-annex-assistant, which is irritating if (like me) you store your ssh config in a vcs. Since the option -F allows the choice of the config file, it should be possible to move the config into ~/.ssh/git-annex/config. The only issue I see is according to the ssh man page on my system states that the system-wide config is ignored if a config file is specified on the command line.
### What version of git-annex are you using? On what operating system?
I'm using git-annex 4.20130601 on a Debian Testing/Unstable/Experimental mix.

8
doc/bugs/Remotes_only_start_showing_changes_after_both_sides_have_written_to_the_repository/comment_3_e3d677ea4170c07cd31efe6dc85fa5f3._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 3"
date="2013-06-11T14:23:31Z"
content="""
This then explains your problem. If you're going to set things up by hand you need to do the same setup that the assistant does of making an initial commit, which can be empty.
"""]]

51
doc/bugs/file_access__47__locking_issues_with_the_assitant.mdwn Normal file
View file

@ -0,0 +1,51 @@
### Please describe the problem.
I have a latex file which takes two passes to build. It is in a directory managed by git-annex assistant and configured to use a remote SSH server as a transfer back-end.
If I use latexmk to build the file with the git-assistant on then the build fails. If I turn off the git-assistant it succeeds.
### What steps will reproduce the problem?
[[!format sh """
~/current/www.cmt.mhs.man.ac.uk $ git-annex assistant --autostart
~/current/www.cmt.mhs.man.ac.uk $ latexmk -c admin_guide_cmt.tex
~/current/www.cmt.mhs.man.ac.uk $ latexmk -pdf -silent admin_guide_cmt.tex
Latexmk: Run number 1 of rule 'pdflatex'
This is pdfTeX, Version 3.1415926-2.5-1.40.13 (TeX Live 2013/dev)
restricted \write18 enabled.
entering extended mode
print() on closed filehandle GEN32 at /usr/bin/latexmk line 4742.
print() on closed filehandle GEN32 at /usr/bin/latexmk line 4759.
print() on closed filehandle GEN32 at /usr/bin/latexmk line 4761.
"""]]
Dropping the silent option shows that the admin_guide_cmt.aux file is not available for writing - despite being created. I suspect that the assistant is somehow locking the file, or using it between passes of latex. If the auxillary files all ready exist then there is no problem (i.e., don't do the cleanup via latexmk -c)
Disabling the assistant makes everything work. Latexmk is doing something odd - I can't replicate with the native latex build commands.
### What version of git-annex are you using? On what operating system?
Latest version, via cabal, on Fedora 18.
### Please provide any additional information below.
Nothing appears wrong with the assistant transfer wise.
[[!format sh """
add www.cmt.mhs.man.ac.uk/admin_guide_cmt.aux (checksum...) ok
add www.cmt.mhs.man.ac.uk/admin_guide_cmt.fdb_latexmk (checksum...) [2013-06-11 14:42:17 BST] Committer: Committing changes to g
it
admin_guide_cmt.fdb_latexmk
264 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1)
sent 372 bytes received 42 bytes 828.00 bytes/sec
total size is 264 speedup is 0.64
[2013-06-11 14:42:17 BST] Transferrer: Uploaded admin_gui..b_latexmk
[2013-06-11 14:42:18 BST] Committer: Adding 3 files
ok
(Recording state in git...)
add www.cmt.mhs.man.ac.uk/admin_guide_cmt.fls (checksum...) ok
add www.cmt.mhs.man.ac.uk/admin_guide_cmt.log (checksum...) ok
# End of transcript or log.
"""]]

21
doc/bugs/file_access__47__locking_issues_with_the_assitant/comment_1_05e1398e78218ced9c2da6a2510949e8._comment Normal file
View file

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU"
nickname="Matt"
subject="comment 1"
date="2013-06-11T13:59:53Z"
content="""
Here's a sample latex document
\documentclass[twocolumn,a4paper]{article}
\title{Test}
\begin{document}
\maketitle
\begin{abstract}
Test
\end{abstract}
Some unresolved refs for two passes:
\ref{one:a} and \ref{two:b}
\end{document}
"""]]

8
doc/bugs/file_access__47__locking_issues_with_the_assitant/comment_2_9226f0adf091154c0d8a08b340b71869._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU"
nickname="Matt"
subject="comment 2"
date="2013-06-11T14:13:22Z"
content="""
My temporary work around so that I may continue to use the assistant is to touch an appropriate test.aux before running latexmk.
"""]]

8
doc/bugs/file_access__47__locking_issues_with_the_assitant/comment_3_44d3e2096b7d45a1062222bee83a346d._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU"
nickname="Matt"
subject="comment 3"
date="2013-06-11T14:23:50Z"
content="""
FYI - I replicated this bug on an OSX system using the latest pre-packaged build of git-annex and TexLive.
"""]]

8
doc/bugs/file_access__47__locking_issues_with_the_assitant/comment_4_f2e1d188b7b2d2daf0d832c59a68583e._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 4"
date="2013-06-11T14:42:09Z"
content="""
Are you using direct mode in your repository?
"""]]

2
doc/design/assistant/blog/day_281__back.mdwn
View file

@ -1,4 +1,4 @@
Slowly getting through the bugs that were opened file I was on vacation and
Slowly getting through the bugs that were opened while I was on vacation and
then I'll try to get to all the comments. 60+ messages to go.
Got git-annex working better on encfs, which does not support hard links in

8
doc/forum/Let_watch_selectively_annex_files/comment_2_2219ff6b4dc927eb2a299cd1af90aed8._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 2"
date="2013-06-11T14:28:56Z"
content="""
See [[tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant]]
"""]]

10
doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_5_96b1eb1e8e9f315c646f4686870f9b52._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 5"
date="2013-06-11T14:30:08Z"
content="""
I think the most useful thing for people in this thread to know about is [[tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant]].
This doesn't solve it at the command line, where you still need to choose between git add and git annex add, but you can use git annex watch to automatically commit small files to git, and large files to the git annex.
"""]]