PR's are a great success

65 views
Skip to first unread message

Edward K. Ream

unread,
Nov 29, 2020, 10:24:01 AM11/29/20
to leo-editor
There were some doubts when we first considered using PR's as part of Leo's workflow. Those doubts have completely vanished. For me, PR's are all gain and no pain:

- There are huge advantages to having a permanent, easy-to-access, authoritative record of all changes to Leo's code base. The first comment of each PR gives an overview of the changes. The code diffs give the ground truth of the changes.

- Creating a PR cost next to nothing.

- PR's impose discipline, including self-discipline, on code changes.

I only rarely make cowboy commits (commits without a PR) to devel. Such commits make trivial changes, like correcting misspellings, etc.

Edward

Félix

unread,
Nov 29, 2020, 3:50:42 PM11/29/20
to leo-editor
Glad this workflow stuck ! its a lot simpler and easier that way! :)

Edward K. Ream

unread,
Nov 30, 2020, 7:57:49 AM11/30/20
to leo-editor
On Sun, Nov 29, 2020 at 2:50 PM Félix <felix...@gmail.com> wrote:
Glad this workflow stuck ! its a lot simpler and easier that way! :)

I have a question for you concerning big diffs in PR's.

My idea is to periodically long-term branches like ekr-unit-test into devel, so as to reduce later diffs (in the PR) to the most recent work.  But I'm concerned that the previous diffs will then be gone forever.

Does this make sense to you? Do you have any suggestions?

Edward

tbp1...@gmail.com

unread,
Nov 30, 2020, 9:12:42 AM11/30/20
to leo-editor
I suggest searching for Raymond Chen's posts on git tricks in his blog "The Old New Things".  This search might be a starting point: "the old new thing" commit tricks. Examples:


He shows ways to merge/update branches while preserving blame and diff histories.  I'm not sure just what search term would find all of them, and he has run several series over the years, but it's worth looking.

Félix

unread,
Nov 30, 2020, 8:43:54 PM11/30/20
to leo-editor
I have not much experience with using diffs in particular ways, other than relatively close the the latest modifications I've done on my projects. 

(I'd love to be a git guru tho, heh, but I'm very far from that)
--
Félix

Edward K. Ream

unread,
Dec 3, 2020, 3:54:27 PM12/3/20
to leo-editor
On Monday, November 30, 2020 at 8:12:42 AM UTC-6 tbp1...@gmail.com wrote:
I suggest searching for Raymond Chen's posts on git tricks in his blog "The Old New Things".  This search might be a starting point: "the old new thing" commit tricks. Examples:


Thanks for these links. At last I can get to them.

Edward
Reply all
Reply to author
Forward
0 new messages