Bugfix/issue547 #7
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fb220e2 Merge pull request #555 from jgoestl/ignoreFilesRecursiv 0a96219 Adjust CHANGELOG 9bd1ad5 Ignore files specified in .syignore recursive 63f6d22 Merge pull request #553 from huahang/patch b6c9e14 add intellij idea project files to gitignore 2cb9e9f Merge pull request #549 from johnathanmartin/develop aeaaba1 Fix Copyright c6e634a Changelog for PR #535 3b09123 Merge pull request #535 from syncany/bugfix/issue534 40588c4 Update README.md 57e489b Merge remote-tracking branch 'origin/develop' into bugfix/issue534 71de9eb Merge pull request #543 from syncany/buildfix/jdk-8-and-trusty-build-jacoco f4107c0 Replace Cobertura with JaCoCo fc17a4a Update Eclipse settings 98c9bc8 Changing to Java 1.8. Includes changes to keep cobertura functional 6baa859 Switching to jdk-8 and trusty build environment because jdk-7 has bugs 95a5e63 Revert "Failing test: restoring a deleted file with only the deletion in history fails" f8df840 Revert "Bumping gradle to hopefully fix buffer overflow on Travis" b8c8b88 Bumping gradle to hopefully fix buffer overflow on Travis 33ae642 Small but useful comments f94d80a JUnit complained about an empty test class, so I removed it from the Suite (all tests are ignored in the first place) bc3413a If the fileHistory is of length 1, we should restore that file. It is probably deleted. b01ab67 Restoring a deleted fileversion is perfectly fine 17c85a3 Failing test: restoring a deleted file with only the deletion in history fails b828edd Bumping AUR package and fixing dependencies 46337f6 Updating syncany-git package with the latest and awesomest stuff 194955d Adding systemd service files for easy daemon control 54b49c3 Bump version 14c8037 Merge tag 'v0.4.7-alpha' into develop e596949 Merge branch 'release/0.4.7-alpha' 89b2067 Merge branch 'develop' of github.com:syncany/syncany into develop 25927ee Update changelog 6d3550b Merge pull request #530 from syncany/bugfix/homebrew 3678f45 Changing old daemon commands to new style b640af3 Merge branch 'develop' of github.com:syncany/syncany into develop 3e3fc85 Fix text 4d129a2 Merge pull request #529 from syncany/bugfix/quoting-batch-script-variables e871fce Fix issue #520 by not resuming if the transaction files are invalid 14cda98 Quoting bash script variables to enable the poor souls with spaces in their path abb0869 Merge branch 'develop' of github.com:syncany/syncany into develop bc41425 Merge branch 'bugfix/memory-usage-down' into develop 4ad4cd4 Fix no database versions after cleanup a5670e3 Merge branch 'bugfix/memory-usage-down' of github.com:syncany/syncany into bugfix/memory-usage-down 7168600 Fix param swap c40c02d Actually insert assembler when necessary (part 3) da7db93 Actually insert assembler when necessary (part 2) 7463c05 Actually insert assembler when necessary d081fbd Merge pull request #513 from Asherehsa/develop 586e8cb 'Fix' Inno Setup by using old version until innoextract can deal with the new version f323d59 Clarify password prompt f032e67 Merge branch 'develop' into bugfix/memory-usage-down 9eac9ff Bump AUR package 7b091ca Update homebrew formula to most recent version d73ad3e Fix version number ea6012a Don't print error stack on casting error 63ad951 Merge branch 'feature/up-refactor' into develop 0b69d2c Merge branch 'develop' into feature/up-refactor 6b62192 Extracting the Assembler as to not reinstantiate it 1276d4c Switch to lazily loading DatabaseVersions such that not too many files are loaded in memory at once 625d4a8 Merge branch 'develop' into feature/up-refactor db22358 Refactor cleanup start, maybe too much already git-subtree-dir: core git-subtree-split: fb220e264642fdc569f5c81d9131e44f9ea80f5d
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
should fix syncany/syncany#547