release 0.6.3 #519
Merged
release 0.6.3 #519
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
Collaborator
estebanlm
commented
Nov 21, 2017
estebanlm
commented
- commit&push can lead to lose data #516: commit&push can lead to lose data
- Iceberg computes wrong reference commit if external resources are involved #508: Iceberg computes wrong reference commit if external resources are involved
- #validateCanPull needs to be in IceRepository #502: #validateCanPull needs to be in IceRepository
- Commits are undone by commiting older version when non-pharo commits are involved #501: Commits are undone by commiting older version when non-pharo commits are involved
- reference commit should be updated when you load a version, even if there is nothing to load #497: reference commit should be updated when you load a version, even if there is nothing to load
- pull request tool is broken in latest pharo 7.0 #496: pull request tool is broken in latest pharo 7.0
- Pharo 6 New repository fails #484: Pharo 6 New repository fails
…p is unstable and unrepetible
…ases Fixing version of Tonel
still a lot of test to go.
IceCommand renamed to IceRepositoryCommand. now, I discovered we do not have any feedback if we cancel a merge, and the tool acts as if the merge happened anyway. This is a problem that exceeds iceberg, but is annoying and needs to be fixed.
Verify sync before commiting
…e commit and head commit changes a package
Move reference commit to head if no other commit between saved package commit and head commit changes a package.
…ore versions in the image we can still try to find the most actual one by looking at the anchestry. If the anchestry chain is consistent than we get the actual one
All pharo packages should have a minimum of comments. Close issue #511
cf_comment_iceberg_packages
Even better detect of possible referenceCommit
created a resumable error to correctly handle the issue. closes #502
refactor some code. remove some not used code.
…l be marked for deletion) translate LGit_GIT_ENONFASTFORWARD to IceRemoteDesynchronized to catch the error as a reaction (not a preemption as before)
refactores some methods
this should avoid the problem of creating tons of merges and weird cases when merging conflicts.
closes #516
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.