Menu
▾
▴
Re: Successful branch-5-0-stable transplant
|
From: Daniel J S. <dan...@ie...> - 2017-10-25 03:10:31
|
Here are my best guesses for the remaining branches (sans that oldest
branch).
[5/30/09 7:30 PM] Child: Start branch for Release 4.4
git -C branch_reference checkout e3ff538655e5b5888d9aa60b63398fc62847e46f
---
MY BEST GUESS AT THE BRANCH POINT IS:
commit 65b26b2a31b4de73417d746abe96561b4655c699
Author: Ethan A Merritt <merritt@u.washington.edu>
Date: Sat May 30 12:20:09 2009 -0700
Update
git -C root_reference checkout 65b26b2a31b4de73417d746abe96561b4655c699
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^-"|
grep -v "^---" | wc -l
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^+"|
grep -v "^+++" | wc -l
1 + 8
---
The diff includes the following:
diff -ur '--exclude=.git' root_reference/ChangeLog
branch_reference/ChangeLog
--- root_reference/ChangeLog 2017-10-24 21:16:50.131656512 -0500
+++ branch_reference/ChangeLog 2017-10-24 21:00:03.367646659 -0500
@@ -1,5 +1,10 @@
2009-05-31 Ethan A Merritt <xxxxxx@xxxxxx>
+ Start branch for Release 4.4
+ Set VERSION to 4.4 PATCHLEVEL to alpha
+
+2009-05-31 Ethan A Merritt <xxxxxx@xxxxxxx>
+
and the first checkin after that is called "Branch point for version
4.4". Although that message would suggest it's the branchpoint, it
actually has
+ New stuff, i.e. code other than bugfixes or things identified as
+ being desireable for version 4.4, should be commited in the
+ development branch only (this one).
+
+ Bugfixes should be applied to both the development branch 4.3
+ (this one) and the new one (branch-4-4-stable). When we release
+ 4.4, we will bump the version number of the development branch to 4.5.
which suggests to me that this is the first commit on master after the
bifurcation.
[11/21/11 11:26 PM] Child: Bump stable version to 4.6; patchlevel is "alpha"
git -C branch_reference checkout 88ccf09ba5b9f6042d7f2911dc1be6ae7a9aa308
---
MY BEST GUESS AT THE BRANCH POINT IS:
commit df14294df51035145dc7c5391d603b0d452bcd20
Author: Ethan A Merritt <merritt@u.washington.edu>
Date: Tue Nov 22 21:12:06 2011 -0800
update Bruce Ravel's contact info
git -C root_reference checkout df14294df51035145dc7c5391d603b0d452bcd20
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^-"|
grep -v "^---" | wc -l
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^+"|
grep -v "^+++" | wc -l
13 + 18
---
The branch-to-master diff with this is includes:
diff -ur '--exclude=.git' root_reference/ChangeLog
branch_reference/ChangeLog
--- root_reference/ChangeLog 2017-10-24 21:39:21.267669735 -0500
+++ branch_reference/ChangeLog 2017-10-24 21:31:56.447665382 -0500
@@ -1,5 +1,10 @@
2011-11-22 Ethan A Merritt <xxxxxx@xxxxxx>
+ * Branchpoint for 4.6
+ cvs tag -b branch-4-6-stable
+
+2011-11-22 Ethan A Merritt <xxxxxx@xxxxxx>
+
and the first branch on master after this includes:
diff --git a/ChangeLog b/ChangeLog
index 90a47dc..d5670d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-11-22 Ethan A Merritt <merritt@u.washington.edu>
+ * Branchpoint for 4.6 (cvs tag -b branch-4-6-stable)
+
+2011-11-22 Ethan A Merritt <merritt@u.washington.edu>
+
but the version number is kept at 4.5.
[8/20/14 1:37 PM] Child: Start of separate branch for version 5 stable
releases
git -C branch_reference checkout 66a787634452661f02d7997a2a780165a89cedf0
---
MY BEST GUESS AT THE BRANCH POINT IS:
commit 9c68a0d5f752801b536c03694cceb8e66b1122cc
Author: Ethan A Merritt <merritt@u.washington.edu>
Date: Tue Aug 19 21:42:44 2014 -0700
Empirical adjustments to dashlength calculated as a function of
linewidth
git -C root_reference checkout 9c68a0d5f752801b536c03694cceb8e66b1122cc
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^-"|
grep -v "^---" | wc -l
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^+"|
grep -v "^+++" | wc -l
4987 + 10
---
The reason there is such a big difference here is that Ethan, when
creating this branch, removed all the old FSF messages from the
ChangeLog except for these two:
diff -ur '--exclude=.git' root_reference/ChangeLog
branch_reference/ChangeLog
--- root_reference/ChangeLog 2017-10-24 21:59:55.967681819 -0500
+++ branch_reference/ChangeLog 2017-10-24 21:57:35.439680444 -0500
@@ -1,3 +1,7 @@
+2014-08-20 Ethan A Merritt <merritt@u.washington.edu>
+
+ * Branchpoint for 5.0 (cvs tag -b branch-5-0-stable)
+
2014-08-20 Ethan A Merritt <merritt@u.washington.edu>
* src/wxterminal/gp_cairo.c: Distinct empirical scale factors for
@@ -1327,4985 +1331,4 @@
>>>>> Bump version to 5.0 alpha <<<<<
and the first checkin on the root/master branch after the bifurcation
was to change the release notes:
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index a08b981..3b77b8c 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,274 +1,6 @@
- GNUPLOT VERSION 5.0.rc1 RELEASE NOTES
- =====================================
+ GNUPLOT VERSION 5.1 NOTES
+ =========================
I'm going to look at that oldest branch and try to make sense of it. As
I said before, I think that all of those checkins, which few if any seem
to have a counter-part in the root branch (as typically Ethan would do
with bug fixes across root and release branches).
Dan
On 10/24/2017 08:22 PM, Daniel J Sebald wrote:
> On 10/24/2017 08:00 PM, Eric S. Raymond wrote:
>> I am pleased to report that the first branch rerooting -
>> branch-5-0-stable - has worked (head content is identical to CVS) and
>> have been incorporated into the reconvert script.
>>
>> One down, five to go.
>
> I've been looking at this a little bit using the diff utility, but it
> requires some inference from the checkin comments to project backward a
> little further than the first commits in a branch. Without going into
> detail, I'll tell you what I have so far that might speed things for a
> couple other branches.
>
> First, that oldest branch I couldn't make sense of and I think it
> actually may be bogus. Rather, it might be that those 3.x series
> commits should actually be mixed in with the master branch. We'll come
> back to this one.
>
> [7/7/04 12:34 PM] Child: Bugfix: Incorrect brace movement cause lost key
> presses.
> git -C branch_reference checkout 536b2f37fdc8438459e7c7b0f44132fcd2204114
> ---
> MY BEST GUESS AT THE BRANCH POINT IS:
> commit 093383fb4f9250b58d832fb10e581d90f48abb9c
> Author: Ethan Merritt <xxxxxx@xxxxxx>
> Date: Wed Jun 30 22:03:30 2004 -0700
> #include gp_time.h
> git -C root_reference checkout 093383fb4f9250b58d832fb10e581d90f48abb9c
> diff -ur --exclude=".git" branch_reference/ root_reference/ | grep "^-"|
> grep -v "^---" | wc -l
> diff -ur --exclude=".git" branch_reference/ root_reference/ | grep "^+"|
> grep -v "^+++" | wc -l
> 23 + 10
> ---
> The distance being quite small and the commit in master after this is
> "Renumbered head trunk version to 4.1.0", which is likely the first
> commit after the bifurcation. Note that Jun 30 is a ways from July 7,
> but that first commit on the new branch is a fix that Ethan also wanted
> to include in the stable release branch.
>
>
> [10/1/06 10:17 AM] Child: Jump to version 4.2, 1st release candidate.
> git -C branch_reference checkout e14ada2e7b0ae4f80d8abeffb5a27d8587a3bbed
> ---
> MY BEST GUESS AT THE BRANCH POINT IS:
> commit e18d4e5da418c2ad5a98a2aff3237088aeee01c8
> Author: Hans-Bernhard Broeker <xxxxxx@xxxxxx>
> Date: Sun Oct 1 17:11:57 2006 +0200
> Jump to version 4.2, 1st release candidate.
> git -C root_reference checkout e18d4e5da418c2ad5a98a2aff3237088aeee01c8
> diff -ur --exclude=".git" branch_reference/ root_reference/ | grep "^-"|
> grep -v "^---" | wc -l
> diff -ur --exclude=".git" branch_reference/ root_reference/ | grep "^+"|
> grep -v "^+++" | wc -l
> 2 + 2
> ---
> In this case HBB specifically made a note about branching.
>
> Dan
|
