summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o <Justin@web>2014-01-29 14:37:34 +0000
committerGravatar admin <admin@branchable.com>2014-01-29 14:37:34 +0000
commit033b7ed26c9f773354ee3c983b14954093f71143 (patch)
treef0e9f3419ff0a4edf79cc8d724779723bcc802da
parent39dd630508ca071a7ff0a13b78d535cb244eed68 (diff)
Added a comment: This test is still failing on Windows
-rw-r--r--doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__/comment_1_dfb520258fdd633285b44cb16fd35612._comment12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__/comment_1_dfb520258fdd633285b44cb16fd35612._comment b/doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__/comment_1_dfb520258fdd633285b44cb16fd35612._comment
new file mode 100644
index 000000000..7ece79f42
--- /dev/null
+++ b/doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__/comment_1_dfb520258fdd633285b44cb16fd35612._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o"
+ nickname="Justin"
+ subject="This test is still failing on Windows"
+ date="2014-01-29T14:37:33Z"
+ content="""
+This 1 test is still failing for me on Windows 7 Pro with the latest release (git-annex version: 5.20140128-gddb2083).
+
+I also followed the manual steps provided in the initial bug report. This resulted in two cloned repos which appeared to have resolved the conflict differently. Upon further investigation, I see that the conflict was in fact resolved consistently, just that the file sizes in the working directories are different because the file contents has not been synced (so some files contain the \"symlink\" path rather than the actual contents).
+
+After running a sync in both repositories with the new --contents option, the two working directories appear to be resolved consistently.
+"""]]