diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-04 13:06:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-04 13:06:09 -0400 |
| commit | badcc71e144235cd2aa87bc0a63354d23985d562 (patch) | |
| tree | e7a5b0e58de89ec10d629689c4b6d7fbd6464b4b | |
| parent | 774db02044054b2bb53449d02c91a3da5fa3fa0f (diff) | |
Windows: Fix several bugs in propigation of changes from the adjusted branch back to the master branch.
3 files changed, 15 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 89ce93b54..b9f5a17e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ git-annex (6.20160420) UNRELEASED; urgency=medium Thanks, freewheelinfranks. * Added DIRHASH-LOWER to external special remote protocol. * git-annex.cabal: Add Setup-Depends. + * Windows: Fix several bugs in propigation of changes from the adjusted + branch back to the master branch. -- Joey Hess <id@joeyh.name> Thu, 28 Apr 2016 13:17:04 -0400 diff --git a/doc/bugs/adjusted_branches_on_windows__58___file_paths_get_messed_up_when_commiting_to_an_adjusted_branch.mdwn b/doc/bugs/adjusted_branches_on_windows__58___file_paths_get_messed_up_when_commiting_to_an_adjusted_branch.mdwn index 261293f2b..863667e31 100644 --- a/doc/bugs/adjusted_branches_on_windows__58___file_paths_get_messed_up_when_commiting_to_an_adjusted_branch.mdwn +++ b/doc/bugs/adjusted_branches_on_windows__58___file_paths_get_messed_up_when_commiting_to_an_adjusted_branch.mdwn @@ -65,3 +65,4 @@ Well, git-annex is wonderful! I use it to sync binary files across linux boxes, I use it for binary distro packages I compile for myself, for my calibre books, pictures, movies... and I'm very happy with it on linux. +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/adjusted_branches_on_windows__58___file_paths_get_messed_up_when_commiting_to_an_adjusted_branch/comment_1_af48a796954033474019b5eb09f54948._comment b/doc/bugs/adjusted_branches_on_windows__58___file_paths_get_messed_up_when_commiting_to_an_adjusted_branch/comment_1_af48a796954033474019b5eb09f54948._comment new file mode 100644 index 000000000..ed621d1c6 --- /dev/null +++ b/doc/bugs/adjusted_branches_on_windows__58___file_paths_get_messed_up_when_commiting_to_an_adjusted_branch/comment_1_af48a796954033474019b5eb09f54948._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2016-05-04T17:03:57Z" + content=""" +There were several places in the adjusted branch code that made unix +filename assumptions. I think I've fixed them all now; it seems to work +well on windows in my testing now. + +You should be able to grab an updated windows build from the windows +autobuilder within the hour. +"""]] |