summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-11-07 14:23:01 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-11-07 14:23:01 -0400
commit2e441e644ccc0c9e2dd01a85150c2187d8027b20 (patch)
tree119a2f298365dc94877ff0de27ef0e979aaa42e1
parent4de51768d9633fcef3c46e6c439892fd752d83b6 (diff)
parentc30486576a96ba28e80c7d7990f92a70386a8328 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/bugs/unlock_should_warn_if_file_isn__39__t_in_repo/comment_2_2e878c5ae1892f16f5b4e515fbe8875b._comment15
1 files changed, 15 insertions, 0 deletions
diff --git a/doc/bugs/unlock_should_warn_if_file_isn__39__t_in_repo/comment_2_2e878c5ae1892f16f5b4e515fbe8875b._comment b/doc/bugs/unlock_should_warn_if_file_isn__39__t_in_repo/comment_2_2e878c5ae1892f16f5b4e515fbe8875b._comment
new file mode 100644
index 000000000..8f34197b6
--- /dev/null
+++ b/doc/bugs/unlock_should_warn_if_file_isn__39__t_in_repo/comment_2_2e878c5ae1892f16f5b4e515fbe8875b._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="edward"
+ avatar="http://cdn.libravatar.org/avatar/1e64ab07e0faced09520a5c589deb70b"
+ subject="comment 2"
+ date="2016-11-07T17:43:31Z"
+ content="""
+I see your point, feel free to close this bug.
+
+There is a way for git-annex to tell that the file is probably meant to be part of the repo because it is a symlink, it doesn't look the same as a new file.
+
+ ~/scratch/annex/bar (master)$ ls -l
+ total 4
+ lrwxrwxrwx 1 edward edward 181 Nov 4 18:02 test -> ../.git/annex/objects/w8/pv/SHA256E-s5--f2ca1bb6c7e907d06dafe4687e579fce76b37e4e93b7605022da52e6ccc26fd2/SHA256E-s5--f2ca1bb6c7e907d06dafe4687e579fce76b37e4e93b7605022da52e6ccc26fd2
+ ~/scratch/annex/bar (master)$
+"""]]