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

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

Browse source
This commit is contained in:
Joey Hess 2013-09-20 12:20:33 -04:00
commit 2c0f751a16
4 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/forum/Slightly_finer_control_over_file_whereabouts/comment_5_e884c001a556a0c693d1cc9a97c068ac._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4830:1600:187::2"
subject="comment 5"
date="2013-09-20T15:31:18Z"
content="""
Ok. This seems to be a bug in git-annex then. While it's surprisingly difficult to do so, it tries to interpet preferred content expressions in a stable way -- that is, they should not want to get a file when it's missing and then want to drop it when it's present.
"""]]

25
doc/forum/Slightly_finer_control_over_file_whereabouts/comment_6_3e8674b5857e4994dfbc26be4f4b2855._comment Normal file
View file

@ -0,0 +1,25 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4830:1600:187::2"
subject="comment 6"
date="2013-09-20T15:36:25Z"
content="""
I tried to reproduce this behavior, but failed. My configuration was 2 repos, A and B, with B the origin of A. A was configured with \"exclude=archive/kronos/*\"
(also tried \"(exclude=archive/kronos/* ) or (not copies=semitrusted+:1)\")
<pre>
joey@darkstar:~/tmp/A>git annex get --auto
joey@darkstar:~/tmp/A>git annex get
get archive/kronos/foo (from origin...) ok
(Recording state in git...)
joey@darkstar:~/tmp/A>git annex drop --auto
drop archive/kronos/foo ok
(Recording state in git...)
joey@darkstar:~/tmp/A>git annex get --auto
joey@darkstar:~/tmp/A>
</pre>
... Which is how you want it to behave.
So I wonder if it's something else in your configuration. The best thing to do would be if you can come up with a series of commands I can follow to build repositories that exhibit the problem.
"""]]

8
doc/forum/Slightly_finer_control_over_file_whereabouts/comment_7_7aeabc2e52a39423e83fbd04560e8f91._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4830:1600:187::2"
subject="comment 7"
date="2013-09-20T15:37:48Z"
content="""
Also, please check if you're running into [[bugs/Handling_of_files_inside_and_outside_archive_directory_at_the_same_time]]
"""]]

12
doc/forum/git-status_typechange_in_direct_mode/comment_1_12c8b67aadbfa2b073e12997a55d49a7._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4830:1600:187::2"
subject="comment 1"
date="2013-09-20T15:24:25Z"
content="""
These messages are normal in direct mode.
They happen because git status does not know about git-annex's direct mode. So it sees a file that has a symlink checked into git, but a normal file in place in the working tree. Thus, its type has changed. Short of hacking or wrapping git, or switching to indirect mode ;), there's not much that can be done about this.
You might want to read [[direct_mode]] for more about this, and some of the problems it can cause when running certian git commands.
"""]]