-
Notifications
You must be signed in to change notification settings - Fork 30
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
refactor centos to opensuse migration (#485) #507
refactor centos to opensuse migration (#485) #507
Conversation
rename file refactor centos to opensuse migration update broken page references fix typos in redirects.txt
0a7dde3
to
4f77e30
Compare
@phillxnet, @FroggyFlox please check out this version. linkcheck failure due to timeout here (but work accessing directly).
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Hooverdan96 Thanks for these improvement. As always much appreciated.
But I can't easily see the actual changes you have made. This may be an artifact/limitation of the GitHub interface or the procedure you used in this file rename. I.e. The GitHub web-UI shows the old file as deleted, and a new one authored by this PR. That is not what has happened here. Did you actually rename the file, or delete and copy the contents to a new file. The issue is that of history in the file, and ease of assessing changes.
Let me know if you wiped the file and created a new file, or renamed the existing file and applied the changes. It is always good to preserve contribution history and this can be lost/miss-attributed when we delete a file and create a new one. Sometimes Git can pick this up and show the changes. Otherwise, in this case it seems to be the case, we loose all attribution to the files history.
Ideally we need to see the changes made, not just a new file as-it-were. Then we can see the progress of that file. Less important in docs (but not ideal as it wipes attribution) but more important when dealing with code as all history of renamed and modified file (if resulting from a cut & paste & edit) is lost. So we have no history there.
Only one modification suggested: but could you also try to re-present this PR which the file rename recognized by git: that way the history of the files contents: including it's rename, can be assessed. More of a practice to ensure we don't loose history for when we do the same in code really.
Take a looks at the "Files changed" GitHub tab in this PR. It shows a deleted file, and a new one (the re-name suggested in the commit message) Git and I'm pretty sure GitHub Web-UI can reflect a rename if done in a git aware fashion. And we then get to maintain history and can see the actual changes made to a file.
If it helps, try starting from the master again and copying in new contents to the existing file. Commit that. Then rename the file, and commit that. Git can then see it as a filename change. Better still is to use the proper git mv
thus no relying on git magic to know what file turned into what differently named file: where my suspicion here is that as the file contents were also changed it couldn't connect the old file contents to the new file contents. Hence the more robust approach of using git mv
as you then announce the filename change to the version control. Without this care we will end up loosing info about history of a files contents. Again attribution concerns over time in docs, but functional regression ananysis concerns when we do the same in code.
Hope this makes sense. In short, to preserve file history (including name change) we have to explicitly use git mv
to anounce this and avoid too much magic which will fail if a files contents are changed. Plus we hopefully get a better PR to be able to see exactly what has changed.
Thanks and my apologies for this run-around. But it's good to get familiar with such approaches else all renames of files loose all original authorship/contribution history and I think with git mv
we can avoid this entirely. Plus we may well have a bunch of such changes coming up in rockstor-core so best we get more familiar with preserving git history over filename changes such as this.
@Hooverdan96 A reference re my suggestion to start over from master and using git itself to do the rename: https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository
|
So with a new PR, resourcing And of course, and as usual, my apologies if this is all just an artifact of the tools being used. But I've seen file-renames appear in the GitHub PR previewer before and it should also then help to see what you have changed in this PR. But what-ever the only change I see that is needed is that sentence and don't worry about my attribution on that one. Hence the suggestion re starting from mater and applying your new content to that but ensuing the filename change is recognised by git, which doesn't look to be the case here. But should 'take' if you do it explicitly via the `git mv' command. Let me know if you would rather me manage this, but it's a handy trick to be aware of, and we can both then see if this is the preferred method. |
Co-authored-by: Philip Guyton <[email protected]>
@phillxnet, strange. I believe, I renamed the file, and not delete it and then creating a new one. so, not sure. I will follow your suggestion (and thanks for passing on the github knowledge, there's always something to learn) and represent the PR. Hopefully, it will then show as a rename/move. Until then I will leave this PR open, just in case. |
ok, this is very strange. I'm using However, I now went to the command line, used So I proceeded to do the remaining changes in the other files. Well, I guess it's Github Desktop's fault ... found this: so I assume, I have to do the whole thing manually on the command line, especially when there is a rename/change involved. Back to the drawing board! |
It looks like, if I create multiple commits (I squashed them last time), then on the commit history one can see the changes. The summary view of files will still show as if one file was deleted and a new one was created. I'll present it like that, and you can take a look. I will reference this PR (unless you don't want me to). And if that works, then I can close this one. |
Closing this PR now, as #508 seems to be the viable path forward |
Fixes #485
This pull request's proposal
Checklist