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

Fix git histories for module-hierarchy reorganized files #159

Closed
emiliom opened this issue Sep 24, 2018 · 1 comment
Closed

Fix git histories for module-hierarchy reorganized files #159

emiliom opened this issue Sep 24, 2018 · 1 comment
Assignees

Comments

@emiliom
Copy link
Member

emiliom commented Sep 24, 2018

It looks like the module files that were moved as part of the removal of the ODM2 module hierarchy lost their git history. Instead, the git history is attached to the files that will eventually be removed, in the old module hierarchy. eg:
https://github.com/ODM2/ODM2PythonAPI/blob/master/odm2api/models.py
vs
https://github.com/ODM2/ODM2PythonAPI/blob/master/odm2api/ODM2/models.py

The module-hierarchy reorg (completed in release 0.7.1) was tracked in issue #146, that I left open for future reference once we're ready to remove the backwards-compatibility old hierarchy.

This specific issue (preserving git history in the files at the new hierarchy) was discussed in #145 (comment). See the specific steps/approach I had proposed there. We'll need to test that these steps get the job done.

@emiliom emiliom self-assigned this Sep 24, 2018
@emiliom emiliom added this to the v0.7.2 release milestone Apr 8, 2019
@emiliom
Copy link
Member Author

emiliom commented Apr 28, 2019

It's looking like this might be a non-issue, ultimately. The challenge apparently is in whether a git log viewing tool (like gitkraken, or github) can detect the link between the old file path and the new file path, specially with git log --follow or its analog. Based on a small test where I took the master branch as of today (4/27/2019), created a new branch from it, then did git rm odm2api/ODM2/models.py, the moved models.py (at odm2api/models.py) does have the complete history available if the viewer tool is smart enough (as is gitkraken) or using git log --follow <file-at-new-path>. I also did another test with ODM2/services/readService.py, and that was "successful" too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant