summaryrefslogtreecommitdiff
path: root/doc/bugs/Merge_involving_symlink_yields_unexpected_results.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-19 13:46:11 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-19 13:55:29 -0400
commitdbfc00e2a6ad99200da35f75f889174cd7bfd195 (patch)
tree9d8a9d1353ab10376183c1bda881fface04b6fcb /doc/bugs/Merge_involving_symlink_yields_unexpected_results.mdwn
parent41b7950285ef1e91b80c441c2be68a1ef4d0d27c (diff)
remove old closed bugs and todo items to speed up wiki updates and reduce size
Remove closed bugs and todos that were last edited or commented before Q3 2015. Command line used: for f in $(grep -l '\[\[done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done for f in $(grep -l '|done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
Diffstat (limited to 'doc/bugs/Merge_involving_symlink_yields_unexpected_results.mdwn')
-rw-r--r--doc/bugs/Merge_involving_symlink_yields_unexpected_results.mdwn51
1 files changed, 0 insertions, 51 deletions
diff --git a/doc/bugs/Merge_involving_symlink_yields_unexpected_results.mdwn b/doc/bugs/Merge_involving_symlink_yields_unexpected_results.mdwn
deleted file mode 100644
index 1ebd4039b..000000000
--- a/doc/bugs/Merge_involving_symlink_yields_unexpected_results.mdwn
+++ /dev/null
@@ -1,51 +0,0 @@
-### Please describe the problem.
-When creating a symlink in repository A, and creating a regular file under the same name in repository B, syncing B will yield the result that the symlink is lost, and both the original filename and the .variant file will point to the same annex object containing the original content from B.
-
-Both A and B are indirect mode repos.
-
-### What steps will reproduce the problem?
-
-[[!format sh """
-
-#Initial state:
-
-repo-A$ echo file1
-This is file 1.
-repo-B$ echo file1
-This is file 1.
-
-#Make conflicting changes:
-
-repo-A$ ln -s file1 file2; git add file2; git commit -m "Add file2 as symlink."
-repo-B$ echo "This is file 2." > file2; git annex add file2; git commit -m "Add file2 as regular file."
-
-#Sync it:
-
-repo-A$ git annex sync
-repo-B$ git annex sync
-
-#Strange result in repo-B:
-
-repo-B$ ls -l file2*
-file2 -> .git/annex/objects/$HASH1
-file2.variant1234 -> .git/annex/objects/$HASH1
-repo-B$ cat file2 file2.variantXXXX
-This is file 2.
-This is file 2.
-
-#Repo-A leaves the symlink change untouched and adds a .variant containing the new regular file data.
-
-repo-A$ ls -l file*
-file2 -> file1
-file2.variant1234 -> .git/annex/objects/$HASH1
-repo-A$ cat file.variant1234
-This is file 2.
-"""]]
-### What version of git-annex are you using? On what operating system?
-Linux 3.15.3
-git-annex 5.20140613
-
-
-[[!tag confirmed]]
-
-> [[fixed|done]] --[[Joey]]