Better Merge parsing#116
Merged
linzhp merged 3 commits intoAug 19, 2011
Merged
Conversation
…put of diff is a merge.
This works only for two-way merges! Three-way or more merges are ignored.
This is so, if a file is changed to a symlink
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Added handling of two-way merges into CVSAnalY. Also added "Type Change", so file's that are change e.g. to a sym-link are also tracked now (marking them as modified).
Also catching a MalformedHunkHeader to prevent Hunks from failing, when a strange Diff-File shows up (a merge, where files are moved and changed in that merge).
SoftwareIntrospectionLab/repositoryhandler#9 is needed for this.