[Infrastructure] Trouble creating a "clean redline" for Forum-12 [Was: Trouble preparing pull request for SC25]

Mon May 4 00:13:51 MST 2020

Once again, I am either not following our documented procedure correctly 
or there is something wrong with the steps.

Following instructions listed in 
https://wiki.cabforum.org/github_redline_guide, I started my process by 
syncing master of https://github.com/dzacharo/documents (my own fork) 
with the official repo master (https://github.com/cabforum/documents).

I did this by following the instructions of "Prerequisites" section 2. 
The result of this was https://github.com/dzacharo/documents/pull/1 
which was merged to my local master.

Then I created a branch 
https://github.com/dzacharo/documents/tree/update-bylaws-to-v2.3

Then I made several commits updating the Bylaws on this branch and 
created a new pull request against my own repo 
(https://github.com/dzacharo/documents/pull/2).

Now it's time to create an immutable redline so I followed  the compare 
instructions, using the last commit of the official repo 
(https://github.com/cabforum/documents/commit/fc63be73323195abc4e462708ca0385e37b7043d) 
and the last commit from my local branch with the bylaws changes 
(https://github.com/dzacharo/documents/commit/a94d136c6ddbd0024e9bdc70785aa71f1e2f6753)

For some reason, I see numerous files that are "claimed" to have changed 
without changing anything. You can verify using 
https://github.com/cabforum/documents/compare/fc63be73323195abc4e462708ca0385e37b7043d..a94d136c6ddbd0024e9bdc70785aa71f1e2f6753#diff-c2f0349076f544cc0e9f059f30f21a85

The patch file against the official master should be available in 
https://patch-diff.githubusercontent.com/raw/dzacharo/documents/pull/2.patch

I'd prefer to have a redline link that includes only the specific file 
(Bylaws.md) and only the changes applied.

My guess is that my repo includes an additional "merge" commit that 
doesn't exist in the official master, so it must have something to do 
with the instructions. Any assistance on how to improve this process 
would be appreciated. It would also be nice to have a solution for 
fixing the existing problem (like, how to take a patch and create a new 
pull request at the official cabforum repo, via a new branch)?

Thank you,
Dimitris.

On 2020-03-04 7:32 μ.μ., Dimitris Zacharopoulos (HARICA) wrote:
>
>
> On 2020-03-04 7:27 μ.μ., Ryan Sleevi wrote:
>>
>>
>> On Wed, Mar 4, 2020 at 1:14 AM Dimitris Zacharopoulos (HARICA) 
>> <dzacharo at harica.gr <mailto:dzacharo at harica.gr>> wrote:
>>
>>
>>
>>     On 2020-03-03 10:10 μ.μ., Ryan Sleevi wrote:
>>>
>>>
>>>     On Tue, Mar 3, 2020 at 2:37 PM Dimitris Zacharopoulos (HARICA)
>>>     <dzacharo at harica.gr <mailto:dzacharo at harica.gr>> wrote:
>>>
>>>
>>>         I am having some difficulties preparing a pull request to
>>>         add
>>>         https://github.com/dougbeattie/documents/commit/bb90ff37c4bc043636229138d992
>>>         3fcff670cdfc#diff-7f6d14a20e7f3beb696b45e1bf8196f2
>>>         <https://github.com/dougbeattie/documents/commit/bb90ff37c4bc043636229138d9923fcff670cdfc#diff-7f6d14a20e7f3beb696b45e1bf8196f2>
>>>
>>>         to cabforum/documents.
>>>
>>>         I tried
>>>         https://github.com/cabforum/documents/compare/master...dougbeattie:bb90ff37c4bc043636229138d9923fcff670cdfc
>>>
>>>         but this adds a lot more changes than just 3.2.2.4.18 and
>>>         3.2.2.4.19.
>>>
>>>         Can anyone assist with this? I wanted to create a pull
>>>         request, add a commit with the information for tables, etc
>>>         and have someone review it before merge to master.
>>>
>>>
>>>     Yup. Now you see why I wanted to streamline the process :)
>>>
>>>     https://github.com/cabforum/documents/pull/162
>>>
>>>     The pull request process is messy because Doug's version of the
>>>     cabforum repository has gotten out of sync.
>>>
>>>     https://github.com/dougbeattie/documents/commit/bb90ff37c4bc043636229138d9923fcff670cdfc.patch
>>>     - you can see that's Doug's commit (and exactly what was voted on)
>>>
>>>     I did this via the command line. Normally, this wouldn't be
>>>     necessary, but the wonky state of Doug's repository made it the
>>>     easiest path forward :)
>>>
>>>     (I made sure my repository and upstream are in sync and w/ no
>>>     unnecessary edits)
>>>     # Create a new branch for working on Doug's change
>>>     $ git checkout -b dougs_change master
>>>     # Download Doug's patch
>>>     $ wget
>>>     https://github.com/dougbeattie/documents/commit/bb90ff37c4bc043636229138d9923fcff670cdfc.patch
>>>     # Apply it to my repository
>>>     $ git am bb90ff37c4bc043636229138d9923fcff670cdfc.patch
>>>     # Cleanup the temp file; making this an explicit step just so my
>>>     process is easily understandable :P
>>>     $ rm bb90ff37c4bc043636229138d9923fcff670cdfc.patch
>>>     # From my workstation, push my branch "dougs_change" to a remote
>>>     branch called "2020-03-03-SC25" in the "origin" repository
>>>     (which is what I named my copy on GitHub)
>>>     $ git push origin dougs_change:2020-03-03-SC25
>>>
>>>     Opened the above PR.
>>>
>>>     You can compare the redline by looking at
>>>     https://patch-diff.githubusercontent.com/raw/cabforum/documents/pull/162.patch and
>>>     comparing that with Doug's original patch. For example,
>>>     diffnow.com <http://diffnow.com> will let you compare by URLs,
>>>     or you can compare those patch files.
>>>
>>>     Enjoy! :)
>>
>>     I certainly enjoy learning about all this and hopefully will be
>>     able to help documenting an update process!
>>
>>     I'm wondering what would be the best way to make the necessary
>>     modifications (versions, table, etc). There is no way for me to
>>     commit to your branch and add this to the pull request, so at
>>     this point, I could perform one of the following:
>>
>>
>> Are you sure? Have you tried editing via the pull request?
>>
>> Commits from maintainers into the pull request are permitted. If 
>> you're a maintainer of cabforum/documents (and you should be), then 
>> you should be able to view the files on the PR and edit directly, 
>> commiting directly to my branch or creating your own copy.
>>
>> Did you try that?
>
> I can see it now (edit the file). Changing it as we speak :-)
>
> Thanks again.
>
>
> Dimitris.
>
>>      1. Review and merge your pull request
>>         (https://github.com/cabforum/documents/pull/162) to master,
>>         then create another pull request with the informative
>>         changes, get this reviewed and merge to master
>>      2. Repeat your process and create an "SC25" branch in the
>>         cabforum/documents repo, add another commit with the
>>         informative changes, then create a new pull request, review,
>>         squash and merge.
>>
>>     If there are other options to explore, please let me know. Also,
>>     I would appreciate any preference you might have on how to best
>>     proceed with this process.
>>
>>
>>     Thanks,
>>
>>     Dimitris.
>>
>
>
> _______________________________________________
> Infrastructure mailing list
> Infrastructure at cabforum.org
> http://cabforum.org/mailman/listinfo/infrastructure

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://cabforum.org/pipermail/infrastructure/attachments/20200504/ee80b072/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: beahekkchmdnjbhc.png
Type: image/png
Size: 49149 bytes
Desc: not available
URL: <http://cabforum.org/pipermail/infrastructure/attachments/20200504/ee80b072/attachment-0001.png>