Support merging conflicts with moved files. #78
Merged
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
ashdnazg
force-pushed
the
fix_dups
branch
3 times, most recently
from
3036188
to
692d0d5
Compare
byohay
requested changes
Aug 3, 2022
|
|
||
| def apply_file_changes(project, additions, removals) | ||
| addition_to_paths = additions.to_multi_h | ||
| removal_to_references = removals.to_multi_h.map do |change, paths| |
There was a problem hiding this comment.
at this group it isn't clear that these are file references. Maybe we should filter them at this point with change["isa"] == "PBXFileReference"
Comment on lines
+419
to
+420
| new_group = theirs_project.main_group.find_subpath("new_group", true) | ||
| file_reference = theirs_project.main_group.find_file_by_path("bar") |
There was a problem hiding this comment.
The group can be created in base_project, then to find the file you can just do: theirs_project["bar"]
|
|
||
| containing_group = path.empty? ? project.main_group : project[path] | ||
|
|
||
| if (removal_to_references[change] || []).compact.empty? |
There was a problem hiding this comment.
Why not doing compact when getting the references?
Otherwise you need to do compact in the line below: removal_to_references[change].compact.length
There was a problem hiding this comment.
We actually should never compact, since we cannot move files which don't exist, as we no longer have their build file
|
F&Sed |
Previously, moved files were removed from one group and added to another. This caused the build files referencing them to remain dangling. This was solved by identifying files that were moved and using the appropriate functions to move them.
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.
Previously, moved files were removed from one group and added to
another. This caused the build files referencing them to remain
dangling. This was solved by identifying files that were moved and using
the appropriate functions to move them.