Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conflicting file paths #24846

Closed
DanielRuf opened this issue Oct 3, 2019 · 19 comments
Closed

Conflicting file paths #24846

DanielRuf opened this issue Oct 3, 2019 · 19 comments
Assignees
Labels
Issue: Format is valid Gate 1 Passed. Automatic verification of issue format passed Progress: needs update

Comments

@DanielRuf
Copy link
Contributor

DanielRuf commented Oct 3, 2019

Preconditions (*)

Conflicting paths:

  'app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontPasswordAutocompleteOffActionGroup.xml'
  'app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontPasswordAutocompleteOffActionGroup.xml'
  'app/code/Magento/Customer/Test/Mftf/ActionGroup/StoreFrontClickSignInButtonActionGroup.xml'
  'app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignInButtonActionGroup.xml'

Steps to reproduce (*)

  1. clone magento2 on macOS or another system with case-insensitive filenames
  2. check the output

Expected result (*)

  1. No problems

Actual result (*)

Conflicts due to same file names but different cases:

  'app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontPasswordAutocompleteOffActionGroup.xml'
  'app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontPasswordAutocompleteOffActionGroup.xml'
  'app/code/Magento/Customer/Test/Mftf/ActionGroup/StoreFrontClickSignInButtonActionGroup.xml'
  'app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignInButtonActionGroup.xml'
@m2-assistant
Copy link

m2-assistant bot commented Oct 3, 2019

Hi @DanielRuf. Thank you for your report.
To help us process this issue please make sure that you provided the following information:

  • Summary of the issue
  • Information on your environment
  • Steps to reproduce
  • Expected and actual results

Please make sure that the issue is reproducible on the vanilla Magento instance following Steps to reproduce. To deploy vanilla Magento instance on our environment, please, add a comment to the issue:

@magento give me 2.3-develop instance - upcoming 2.3.x release

For more details, please, review the Magento Contributor Assistant documentation.

@DanielRuf do you confirm that you were able to reproduce the issue on vanilla Magento instance following steps to reproduce?

  • yes
  • no

@magento-engcom-team magento-engcom-team added the Issue: Format is valid Gate 1 Passed. Automatic verification of issue format passed label Oct 3, 2019
@DanielRuf DanielRuf changed the title Cobflicting file paths Conflicting file paths Oct 3, 2019
@engcom-Charlie engcom-Charlie self-assigned this Oct 4, 2019
@m2-assistant
Copy link

m2-assistant bot commented Oct 4, 2019

Hi @engcom-Charlie. Thank you for working on this issue.
In order to make sure that issue has enough information and ready for development, please read and check the following instruction: 👇

  • 1. Verify that issue has all the required information. (Preconditions, Steps to reproduce, Expected result, Actual result).

    DetailsIf the issue has a valid description, the label Issue: Format is valid will be added to the issue automatically. Please, edit issue description if needed, until label Issue: Format is valid appears.

  • 2. Verify that issue has a meaningful description and provides enough information to reproduce the issue. If the report is valid, add Issue: Clear Description label to the issue by yourself.

  • 3. Add Component: XXXXX label(s) to the ticket, indicating the components it may be related to.

  • 4. Verify that the issue is reproducible on 2.3-develop branch

    Details- Add the comment @magento give me 2.3-develop instance to deploy test instance on Magento infrastructure.
    - If the issue is reproducible on 2.3-develop branch, please, add the label Reproduced on 2.3.x.
    - If the issue is not reproducible, add your comment that issue is not reproducible and close the issue and stop verification process here!

  • 5. Add label Issue: Confirmed once verification is complete.

  • 6. Make sure that automatic system confirms that report has been added to the backlog.

@engcom-Charlie
Copy link
Contributor

Hello @DanielRuf
Could you add any steps to reproduce this issue?
At what stage is the conflict displayed?

@DanielRuf
Copy link
Contributor Author

Could you add any steps to reproduce this issue?

It happens on git clone on macOS at the very end.

@pa7751
Copy link

pa7751 commented Oct 4, 2019

@magento-engcom-team give me 2.3.2 instance

@magento-engcom-team
Copy link
Contributor

Hi @pa7751. Thank you for your request. I'm working on Magento 2.3.2 instance for you

@magento-engcom-team
Copy link
Contributor

Hi @pa7751, here is your Magento instance.
Admin access: https://i-24846-2-3-2.instances.magento-community.engineering/admin
Login: admin Password: 123123q
Instance will be terminated in up to 3 hours.

@DanielRuf
Copy link
Contributor Author

The testinstance does not help here ;-)

In general there should not be any files with the same filename but different cases. This can break on many systems and produce other issues.

@DanielRuf
Copy link
Contributor Author

Please simply rename the files.

StorefrontClickSignInButtonActionGroup.xml
StoreFrontClickSignInButtonActionGroup.xml

and

AssertStoreFrontPasswordAutocompleteOffActionGroup.xml
AssertStorefrontPasswordAutocompleteOffActionGroup.xml

@DanielRuf
Copy link
Contributor Author

I'm currently on it.

@DanielRuf
Copy link
Contributor Author

Will be fixed by #24856

@engcom-Charlie
Copy link
Contributor

I often clone magento 2 but have never seen a similar problem.
There are no files specified in the magento / magento2 repository(

AssertStoreFrontPasswordAutocompleteOffActionGroup.xml
StoreFrontClickSignInButtonActionGroup.xml

).

It only has files with a small letter f:

https://github.com/magento/magento2/blob/2.3-develop/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontPasswordAutocompleteOffActionGroup.xml
https://github.com/magento/magento2/blob/2.3-develop/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignInButtonActionGroup.xml

So i can't reproduce this issue.
image
I tried simply rename the files and i had no problems.

This issue should be closed.
Thanks for your report!

@DanielRuf DanielRuf reopened this Oct 4, 2019
@ghost ghost assigned DanielRuf and unassigned DanielRuf and engcom-Charlie Oct 4, 2019
@DanielRuf
Copy link
Contributor Author

It was probably renamed and Git checked out the old and new version. That happened on a new clone.

I did a fresh clone today and both files appear there.

@DanielRuf
Copy link
Contributor Author

You can verify this on Linux.

@hostep
Copy link
Contributor

hostep commented Oct 4, 2019

Hmm, @DanielRuf, Issue doesn't seem to be correct, I only notice one of those files in the git repo, have you checked Github's rendering of that directory?

I'm running a case sensitive file system on my macOS (as every web developer should do if they target linux machines in my opinion), and I'm only seeing a single file in a clone of this git repo.

5 minutes later: Aha, found it, you are probably using a not very up2date clone of the repo? Because those two files already got removed a while ago in #21647

We should probably close this issue and your PR?

@DanielRuf
Copy link
Contributor Author

I have done a simple clone on my macBook. It depends on your file system. See the PR. It is definitely there.

@DanielRuf
Copy link
Contributor Author

The message that there are conflicting file paths with the list of these 4 files was output by Git at the initial clone.

@DanielRuf
Copy link
Contributor Author

I had directly cloned from the latest version of magento/magento2.

@DanielRuf
Copy link
Contributor Author

Hm, that is weird. I guess the issue is that it is still in the Git log.

Anyways, let's close it. Thanks for checking this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Issue: Format is valid Gate 1 Passed. Automatic verification of issue format passed Progress: needs update
Projects
None yet
Development

No branches or pull requests

5 participants