raphinesse opened a new pull request #158:
URL: https://github.com/apache/cordova-common/pull/158


   ### Motivation and Context
   <!-- Why is this change required? What problem does it solve? -->
   <!-- If it fixes an open issue, please link to the issue here. -->
   Apparently, when providing two `<edit-config>`s targeting the same `*.plist` 
file, then our conflict-checking code tried to apply XML-only logic to a Plist 
file representation. This resulted in the error described in #156.
   
   Fixes #156, closes #157
   
   ### Description
   <!-- Describe your changes in detail -->
   I added an explicit check for the type of file an `<edit-config>` applies 
to. Now we only do the XML-specific stuff when dealing with XML files.
   
   
   ### Testing
   <!-- Please describe in detail how you tested your changes. -->
   Manual testing against repro provided in #156
   
   It would be great if we had a regression test for this. So if someone has 
time to add one, that would be great. If not we might have to make do without 
one.
   
   
   ### Checklist
   
   - [x] I've run the tests to see all new and existing tests pass
   - [ ] I added automated test coverage as appropriate for this change
   - [x] If this Pull Request resolves an issue, I linked to the issue in the 
text above (and used the correct [keyword to close issues using 
keywords](https://help.github.com/articles/closing-issues-using-keywords/))
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[email protected]



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to