<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, May 4, 2020 at 3:13 AM Dimitris Zacharopoulos (HARICA) <<a href="mailto:dzacharo@harica.gr">dzacharo@harica.gr</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div>
<br>
Once again, I am either not following our documented procedure
correctly or there is something wrong with the steps.<br>
<br>
Following instructions listed in <a href="https://wiki.cabforum.org/github_redline_guide" target="_blank">https://wiki.cabforum.org/github_redline_guide</a>,
I started my process by syncing master of <a href="https://github.com/dzacharo/documents" target="_blank">https://github.com/dzacharo/documents</a>
(my own fork) with the official repo master (<a href="https://github.com/cabforum/documents" target="_blank">https://github.com/cabforum/documents</a>).<br>
<br>
I did this by following the instructions of "Prerequisites" section
2. The result of this was <a href="https://github.com/dzacharo/documents/pull/1" target="_blank">https://github.com/dzacharo/documents/pull/1</a>
which was merged to my local master.<br></div></blockquote><div><br></div><div>It looks like you didn't click "Merge Pull Request" but did "Squash and Merge"</div><div><br></div><div>"Merge Pull Request" is supposed to be the default, based on <a href="https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request">https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request</a> , but Step 2 on the wiki didn't call that out. I've updated as such.</div><div><br></div><div>This is why it still says you're "50 commits behind master" - because you're not actually in sync with master, you diverged 50 commits ago by squashing those 50 commits into a single commit. I've also updated the Wiki to reflect that it's a Bad Thing if you don't see that.</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div>
Then I created a branch <a href="https://github.com/dzacharo/documents/tree/update-bylaws-to-v2.3" target="_blank">https://github.com/dzacharo/documents/tree/update-bylaws-to-v2.3</a><br>
<br>
Then I made several commits updating the Bylaws on this branch and
created a new pull request against my own repo (<a href="https://github.com/dzacharo/documents/pull/2" target="_blank">https://github.com/dzacharo/documents/pull/2</a>).<br>
<br>
Now it's time to create an immutable redline so I followed the
compare instructions, using the last commit of the official repo
(<a href="https://github.com/cabforum/documents/commit/fc63be73323195abc4e462708ca0385e37b7043d" target="_blank">https://github.com/cabforum/documents/commit/fc63be73323195abc4e462708ca0385e37b7043d</a>)
and the last commit from my local branch with the bylaws changes
(<a href="https://github.com/dzacharo/documents/commit/a94d136c6ddbd0024e9bdc70785aa71f1e2f6753" target="_blank">https://github.com/dzacharo/documents/commit/a94d136c6ddbd0024e9bdc70785aa71f1e2f6753</a>)<br></div></blockquote><div><br></div><div>Because of the above, you effectively "forked" from the official repo at the point you did your merge - to the official Repo, it's a series of several distinct commits, while in your Repo, it's only a single commit.</div><div><br></div><div>Now, while the effective state of the repos (the last commit of official, the last commit *before* your changes) should be identical in content, they're not identical in hashes, hence the issue you see. However, if they really are identical (and I've not confirmed), then the answer is make your immutable diff from (the last commit from the official repo in *your* branch) to (the last commit of your changes).</div><div><br></div><div>This is <a href="https://github.com/cabforum/documents/compare/740e4b1be75a2c3468c8448cb7cdf9dff10bc69f..a94d136c6ddbd0024e9bdc70785aa71f1e2f6753#diff-c2f0349076f544cc0e9f059f30f21a85">https://github.com/cabforum/documents/compare/740e4b1be75a2c3468c8448cb7cdf9dff10bc69f..a94d136c6ddbd0024e9bdc70785aa71f1e2f6753#diff-c2f0349076f544cc0e9f059f30f21a85</a> (that is, starting with your <a href="https://github.com/dzacharo/documents/commit/740e4b1be75a2c3468c8448cb7cdf9dff10bc69f">https://github.com/dzacharo/documents/commit/740e4b1be75a2c3468c8448cb7cdf9dff10bc69f</a> )</div><div><br></div><div>That's still immutable, and in theory can be cleanly applied against upstream.</div><div><br></div><div>This is super-easy to fix on the command-line, similar to Doug's change (as was before), because the <a href="https://github.com/cabforum/documents/compare/740e4b1be75a2c3468c8448cb7cdf9dff10bc69f..a94d136c6ddbd0024e9bdc70785aa71f1e2f6753.patch">patch file</a> can be easily downloaded and applied to a 'clean' repository to create the pull request.</div><div><br></div><div>It's unclear what you'd like to do here, so I'm holding off on offering solutions. I could easily create a PR with "just" your commits in my branch, I could help you get your 'master' repository back to a clean slate and rebase your branch on-top of it (a bit more involved, but preserves exact commits), or you could just create a second fork from a clean slate and apply the delta of changes. Lots of options here, but in all scenarios, all of your data is preserved, nothing is lost or messed up, and we've got an unambiguous recoverable trail of your edits :)</div><div> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div>
<br>
For some reason, I see numerous files that are "claimed" to have
changed without changing anything. You can verify using
<a href="https://github.com/cabforum/documents/compare/fc63be73323195abc4e462708ca0385e37b7043d..a94d136c6ddbd0024e9bdc70785aa71f1e2f6753#diff-c2f0349076f544cc0e9f059f30f21a85" target="_blank">https://github.com/cabforum/documents/compare/fc63be73323195abc4e462708ca0385e37b7043d..a94d136c6ddbd0024e9bdc70785aa71f1e2f6753#diff-c2f0349076f544cc0e9f059f30f21a85</a><br>
<br>
<img src="cid:171e046252de41a5e651" alt="" width="872" height="498"><br>
<br>
The patch file against the official master should be available in
<a href="https://patch-diff.githubusercontent.com/raw/dzacharo/documents/pull/2.patch" target="_blank">https://patch-diff.githubusercontent.com/raw/dzacharo/documents/pull/2.patch</a><br>
<br>
I'd prefer to have a redline link that includes only the specific
file (Bylaws.md) and only the changes applied.<br>
<br>
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)?<br>
<br>
<br>
Thank you,<br>
Dimitris.<br>
<br>
<div>On 2020-03-04 7:32 μ.μ., Dimitris
Zacharopoulos (HARICA) wrote:<br>
</div>
<blockquote type="cite">
<br>
<br>
<div>On 2020-03-04 7:27 μ.μ., Ryan Sleevi
wrote:<br>
</div>
<blockquote type="cite">
<div dir="ltr">
<div dir="ltr"><br>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Wed, Mar 4, 2020 at
1:14 AM Dimitris Zacharopoulos (HARICA) <<a href="mailto:dzacharo@harica.gr" target="_blank">dzacharo@harica.gr</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div> <br>
<br>
<div>On 2020-03-03 10:10 μ.μ., Ryan Sleevi wrote:<br>
</div>
<blockquote type="cite">
<div dir="ltr">
<div dir="ltr"><br>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Tue, Mar 3,
2020 at 2:37 PM Dimitris Zacharopoulos (HARICA)
<<a href="mailto:dzacharo@harica.gr" target="_blank">dzacharo@harica.gr</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div> <br>
I am having some difficulties preparing a pull
request to add <a href="https://github.com/dougbeattie/documents/commit/bb90ff37c4bc043636229138d9923fcff670cdfc#diff-7f6d14a20e7f3beb696b45e1bf8196f2" rel="noreferrer" target="_blank">https://github.com/dougbeattie/documents/commit/bb90ff37c4bc043636229138d992<br>
3fcff670cdfc#diff-7f6d14a20e7f3beb696b45e1bf8196f2</a><br>
<br>
to cabforum/documents.<br>
<br>
I tried <a href="https://github.com/cabforum/documents/compare/master...dougbeattie:bb90ff37c4bc043636229138d9923fcff670cdfc" target="_blank">https://github.com/cabforum/documents/compare/master...dougbeattie:bb90ff37c4bc043636229138d9923fcff670cdfc</a><br>
<br>
but this adds a lot more changes than just
3.2.2.4.18 and 3.2.2.4.19.<br>
<br>
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.<br>
</div>
</blockquote>
<div><br>
</div>
<div>Yup. Now you see why I wanted to streamline
the process :)</div>
<div><br>
</div>
<div><a href="https://github.com/cabforum/documents/pull/162" target="_blank">https://github.com/cabforum/documents/pull/162</a> <br>
</div>
<div><br>
</div>
<div>The pull request process is messy because
Doug's version of the cabforum repository has
gotten out of sync.</div>
<div><br>
</div>
<div><a href="https://github.com/dougbeattie/documents/commit/bb90ff37c4bc043636229138d9923fcff670cdfc.patch" target="_blank">https://github.com/dougbeattie/documents/commit/bb90ff37c4bc043636229138d9923fcff670cdfc.patch</a>
- you can see that's Doug's commit (and exactly
what was voted on)</div>
<div><br>
</div>
<div>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 :)</div>
<div><br>
</div>
<div>(I made sure my repository and upstream are
in sync and w/ no unnecessary edits)</div>
<div># Create a new branch for working on Doug's
change</div>
<div>$ git checkout -b dougs_change master</div>
<div># Download Doug's patch</div>
<div>$ wget <a href="https://github.com/dougbeattie/documents/commit/bb90ff37c4bc043636229138d9923fcff670cdfc.patch" target="_blank">https://github.com/dougbeattie/documents/commit/bb90ff37c4bc043636229138d9923fcff670cdfc.patch</a></div>
<div># Apply it to my repository</div>
$ git am
bb90ff37c4bc043636229138d9923fcff670cdfc.patch </div>
<div class="gmail_quote"># Cleanup the temp file;
making this an explicit step just so my process is
easily understandable :P</div>
<div class="gmail_quote">$ rm
bb90ff37c4bc043636229138d9923fcff670cdfc.patch </div>
<div class="gmail_quote"># 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)</div>
<div class="gmail_quote">$ git push origin
dougs_change:2020-03-03-SC25</div>
<div class="gmail_quote"><br>
</div>
<div class="gmail_quote">Opened the above PR.</div>
<div class="gmail_quote"><br>
</div>
<div class="gmail_quote">You can compare the redline
by looking at <a href="https://patch-diff.githubusercontent.com/raw/cabforum/documents/pull/162.patch" target="_blank">https://patch-diff.githubusercontent.com/raw/cabforum/documents/pull/162.patch</a> and
comparing that with Doug's original patch. For
example, <a href="http://diffnow.com" target="_blank">diffnow.com</a>
will let you compare by URLs, or you can compare
those patch files.</div>
<div class="gmail_quote"><br>
</div>
<div class="gmail_quote">Enjoy! :)</div>
</div>
</blockquote>
<br>
I certainly enjoy learning about all this and hopefully
will be able to help documenting an update process!<br>
<br>
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:<br>
</div>
</blockquote>
<div><br>
</div>
<div>Are you sure? Have you tried editing via the pull
request?</div>
<div><br>
</div>
<div>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.</div>
<div><br>
</div>
<div>Did you try that?</div>
</div>
</div>
</blockquote>
<br>
I can see it now (edit the file). Changing it as we speak :-)<br>
<br>
Thanks again.<br>
<br>
<br>
Dimitris.<br>
<br>
<blockquote type="cite">
<div dir="ltr">
<div class="gmail_quote">
<div> </div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div>
<ol>
<li>Review and merge your pull request (<a href="https://github.com/cabforum/documents/pull/162" target="_blank">https://github.com/cabforum/documents/pull/162</a>)
to master, then create another pull request with the
informative changes, get this reviewed and merge to
master</li>
<li>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.</li>
</ol>
<p>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.</p>
<p><br>
</p>
<p>Thanks,</p>
<p>Dimitris.<br>
</p>
</div>
</blockquote>
</div>
</div>
</blockquote>
<br>
<br>
<fieldset></fieldset>
<pre>_______________________________________________
Infrastructure mailing list
<a href="mailto:Infrastructure@cabforum.org" target="_blank">Infrastructure@cabforum.org</a>
<a href="http://cabforum.org/mailman/listinfo/infrastructure" target="_blank">http://cabforum.org/mailman/listinfo/infrastructure</a>
</pre>
</blockquote>
<br>
</div>
</blockquote></div></div>