Re: [SCM] The nmh Mail Handling System branch, master, updated. 1.7-branchpoint-887-g54434563
Hi David, > > I can see tag 1.8-branchpoint is the branch point for the > > 1.8-release branch, but why are 69027ab9, 760a6ba9, 5608cda8, which > > alter VERSION and DATE, on master rather than 1.8-release? > > Good question. When I did that I was thinking of where master is at > that point in time. Maybe it should just be 1.8+dev? Yes, I think so if all further 1.8 work happens on branch 1.8-release. I think that's what docs/README.developers suggests too, even before my recent commit. :-) -- Cheers, Ralph.
Re: [SCM] The nmh Mail Handling System branch, master, updated. 1.7-branchpoint-887-g54434563
Ralph wrote: > I've pushed a few more trivial documentation things to master, which > don't have to make 1.8. Those will be in 1.8. > I can see tag 1.8-branchpoint is the branch point for the 1.8-release > branch, but why are 69027ab9, 760a6ba9, 5608cda8, which alter VERSION > and DATE, on master rather than 1.8-release? Good question. When I did that I was thinking of where master is at that point in time. Maybe it should just be 1.8+dev? David
Re: [SCM] The nmh Mail Handling System branch, master, updated. 1.7-branchpoint-887-g54434563
Hi David, > > Should I stop pushing commits now so as to not get in your way, or > > keep pottering them in as they may make it if there's an 1.8-RC2? > > I'd rather avoid code changes because, in theory, they'd require > complete re-testing. Agreed. > If you find a code change that really should go in, how about posting > it here for concurrence? Everything else should be easy to cherry > pick. I've pushed a few more trivial documentation things to master, which don't have to make 1.8. I'm not intending to post anything to branch 1.8-release, considering it your domain. I'm a bit puzzled by the tags and branches though. ┌ 68228e3c (origin/master, origin/HEAD) │ man/burst.man: re-word to avoid ‘digestifying’, etc. ⋮ ├ a3a23a66 man/*.man: fix options which didn't escape their hyphen. ├ 277347a4 NEWS: fix spelling of ‘MIME’. ├ f8fb242b NEWS: add a link to Norm's Wikipedia page. ├ 19d63f85 .gitignore: move ‘/configure~’ entry to correct section. ├ 5608cda8 Update for 1.8-RC1. │ ├ 760a6ba9 (tag: 1.8-RC1) │ Updates for 1.8 release. ├ 69027ab9 Update for 1.8 release. │ │ ┌ a60e1455 (origin/1.8-release) │ │ man/*.man: fix options which didn't escape their hyphen. │ ├ 8ec6dc0e NEWS: fix spelling of ‘MIME’. │ ├ 1f4822e8 NEWS: add a link to Norm's Wikipedia page. │ ├ 2e344864 .gitignore: move ‘/configure~’ entry to correct section. ├─┘ ├ 54434563 (tag: 1.8-branchpoint) Updates for 1.8 release. ├ bee25da0 Ignore configure tilde file ⋮ I can see tag 1.8-branchpoint is the branch point for the 1.8-release branch, but why are 69027ab9, 760a6ba9, 5608cda8, which alter VERSION and DATE, on master rather than 1.8-release? -- Cheers, Ralph.
Re: [SCM] The nmh Mail Handling System branch, master, updated. 1.7-branchpoint-887-g54434563
Ralph wrote: > I've pushed a little update to that to master which falls after the 1.8 > tags. > > a3a23a66 (origin/master, origin/HEAD) > man/*.man: fix options which didn't escape their hyphen. > → 277347a4 NEWS: fix spelling of ‘MIME’. > f8fb242b NEWS: add a link to Norm's Wikipedia page. > 19d63f85 .gitignore: move ‘/configure~’ entry to correct section. Thanks for catching those. I cherry picked them to the branch. > Should I stop pushing commits now so as to not get in your way, or keep > pottering them in as they may make it if there's an 1.8-RC2? I'd rather avoid code changes because, in theory, they'd require complete re-testing. If you find a code change that really should go in, how about posting it here for concurrence? Everything else should be easy to cherry pick. David
Re: [SCM] The nmh Mail Handling System branch, master, updated. 1.7-branchpoint-887-g54434563
Hi David, > Summary of changes: > NEWS | 112 > - I've pushed a little update to that to master which falls after the 1.8 tags. a3a23a66 (origin/master, origin/HEAD) man/*.man: fix options which didn't escape their hyphen. → 277347a4 NEWS: fix spelling of ‘MIME’. f8fb242b NEWS: add a link to Norm's Wikipedia page. 19d63f85 .gitignore: move ‘/configure~’ entry to correct section. 5608cda8 Update for 1.8-RC1. 760a6ba9 (tag: 1.8-RC1) Updates for 1.8 release. 69027ab9 Update for 1.8 release. 54434563 (tag: 1.8-branchpoint, origin/1.8-release) Updates for 1.8 release. bee25da0 Ignore configure tilde file 2f95bdd7 Explicitly mark mhical.c as living in $(srcdir) f116eb31 uip/mhlistsbr.c: switch some printf(3) for puts(3), and similar. Should I stop pushing commits now so as to not get in your way, or keep pottering them in as they may make it if there's an 1.8-RC2? (It's been so long, I've forgotten the conventions.) -- Cheers, Ralph.