Re: [ovs-dev] [PATCH v3] Documentation: Updates for rename of primary development branch as main.
On Wed, Apr 10, 2024 at 12:07:12PM +0100, Simon Horman wrote:
> On Tue, Apr 09, 2024 at 07:28:08PM +0200, Ilya Maximets wrote:
> > On 4/5/24 15:57, Simon Horman wrote:
> > > Recently OVS adopted a policy of using the inclusive naming word list v1
> > > [1, 2].
> > >
> > > In keeping with this policy rename the primary development branch from
> > > 'master' to 'main'. This patch does not actually make that change, but
> > > rather updates references to the branch in documentation in the source
> > > tree. It is intended to be applied at (approximately) the same time
> > > that the change is made.
> > >
> > > OVS is currently hosted on GitHub. We can expect the following behaviour
> > > after the rename:
> > >
> > > 1. GitHub pull requests against are renamed branch are automatically
> > >re-homed on new branch
> > > 2. GitHub Issues do not seem to be affected - at least the test issue I
> > >created had no association with a branch
> > > 3. URLs accessed via the GitHub web UI are automatically renamed
> > >(so long as a new branch called master is not created).
> > > 4. Using the git cli command, fetch will fetch the new branch (main),
> > >and fetch -p will remove (prune) the old branch (master)
> > >
> > > [1] df5e5cf4318a ("Documentation: Add section on inclusive language.")
> > > [2] https://inclusivenaming.org/word-lists/
> > >
> > > Signed-off-by: Simon Horman
> > > ---
> > > Changes in v3:
> > > - This patch only updates documentation. Update the patch prefix and
> > > description accordingly.
> > > - Drop documentation of 'tested on "master" branch' rather than updating
> > > it, as the updated text seems somewhat nonsensical.
> > > - Correct indentation of NEWS entry.
> >
> > Thanks, Simon!
> >
> > Acked-by: Ilya Maximets
> >
> > >
> > > Changes in v2:
> > > - Keep two blank lines between versions.
> > > - Drop bogus update to OpenSSL hashes URL in appveyor.yml.
> > > - Drop other appveyor.yml changes, they are now present upstream.
> > > + appveyor: Prepare for rename of primary development branch.
> > > https://github.com/openvswitch/ovs/commit/95ff912edef8
> > > - Add note about updates to git configuration.
> > > ---
> > > Notes:
> > >
> > > * Now is the time to raise any concerns regarding this patch.
> > > It is planned to implement this change next week.
> >
> > Do you have particular date in mind?
>
> Hi Ilya,
>
> I think that today or tomorrow would be good, to give a bit
> of space before the weekend. But whenever suits you: I believe
> it is you who needs to make the change.
As discussed off-list, the rename has now occurred, thanks!
And I have now applied this patch to main.
- Documentation: Updates for rename of primary development branch as main.
https://github.com/openvswitch/ovs/commit/74cf01436fd2
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH v3] Documentation: Updates for rename of primary development branch as main.
On Tue, Apr 09, 2024 at 07:28:08PM +0200, Ilya Maximets wrote:
> On 4/5/24 15:57, Simon Horman wrote:
> > Recently OVS adopted a policy of using the inclusive naming word list v1
> > [1, 2].
> >
> > In keeping with this policy rename the primary development branch from
> > 'master' to 'main'. This patch does not actually make that change, but
> > rather updates references to the branch in documentation in the source
> > tree. It is intended to be applied at (approximately) the same time
> > that the change is made.
> >
> > OVS is currently hosted on GitHub. We can expect the following behaviour
> > after the rename:
> >
> > 1. GitHub pull requests against are renamed branch are automatically
> >re-homed on new branch
> > 2. GitHub Issues do not seem to be affected - at least the test issue I
> >created had no association with a branch
> > 3. URLs accessed via the GitHub web UI are automatically renamed
> >(so long as a new branch called master is not created).
> > 4. Using the git cli command, fetch will fetch the new branch (main),
> >and fetch -p will remove (prune) the old branch (master)
> >
> > [1] df5e5cf4318a ("Documentation: Add section on inclusive language.")
> > [2] https://inclusivenaming.org/word-lists/
> >
> > Signed-off-by: Simon Horman
> > ---
> > Changes in v3:
> > - This patch only updates documentation. Update the patch prefix and
> > description accordingly.
> > - Drop documentation of 'tested on "master" branch' rather than updating
> > it, as the updated text seems somewhat nonsensical.
> > - Correct indentation of NEWS entry.
>
> Thanks, Simon!
>
> Acked-by: Ilya Maximets
>
> >
> > Changes in v2:
> > - Keep two blank lines between versions.
> > - Drop bogus update to OpenSSL hashes URL in appveyor.yml.
> > - Drop other appveyor.yml changes, they are now present upstream.
> > + appveyor: Prepare for rename of primary development branch.
> > https://github.com/openvswitch/ovs/commit/95ff912edef8
> > - Add note about updates to git configuration.
> > ---
> > Notes:
> >
> > * Now is the time to raise any concerns regarding this patch.
> > It is planned to implement this change next week.
>
> Do you have particular date in mind?
Hi Ilya,
I think that today or tomorrow would be good, to give a bit
of space before the weekend. But whenever suits you: I believe
it is you who needs to make the change.
Kind regards,
Simon
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH v3] Documentation: Updates for rename of primary development branch as main.
On 4/5/24 15:57, Simon Horman wrote:
> Recently OVS adopted a policy of using the inclusive naming word list v1
> [1, 2].
>
> In keeping with this policy rename the primary development branch from
> 'master' to 'main'. This patch does not actually make that change, but
> rather updates references to the branch in documentation in the source
> tree. It is intended to be applied at (approximately) the same time
> that the change is made.
>
> OVS is currently hosted on GitHub. We can expect the following behaviour
> after the rename:
>
> 1. GitHub pull requests against are renamed branch are automatically
>re-homed on new branch
> 2. GitHub Issues do not seem to be affected - at least the test issue I
>created had no association with a branch
> 3. URLs accessed via the GitHub web UI are automatically renamed
>(so long as a new branch called master is not created).
> 4. Using the git cli command, fetch will fetch the new branch (main),
>and fetch -p will remove (prune) the old branch (master)
>
> [1] df5e5cf4318a ("Documentation: Add section on inclusive language.")
> [2] https://inclusivenaming.org/word-lists/
>
> Signed-off-by: Simon Horman
> ---
> Changes in v3:
> - This patch only updates documentation. Update the patch prefix and
> description accordingly.
> - Drop documentation of 'tested on "master" branch' rather than updating
> it, as the updated text seems somewhat nonsensical.
> - Correct indentation of NEWS entry.
Thanks, Simon!
Acked-by: Ilya Maximets
>
> Changes in v2:
> - Keep two blank lines between versions.
> - Drop bogus update to OpenSSL hashes URL in appveyor.yml.
> - Drop other appveyor.yml changes, they are now present upstream.
> + appveyor: Prepare for rename of primary development branch.
> https://github.com/openvswitch/ovs/commit/95ff912edef8
> - Add note about updates to git configuration.
> ---
> Notes:
>
> * Now is the time to raise any concerns regarding this patch.
> It is planned to implement this change next week.
Do you have particular date in mind?
Best regards, Ilya Maximets.
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH v3] Documentation: Updates for rename of primary development branch as main.
On 5 Apr 2024, at 15:57, Simon Horman wrote:
> Recently OVS adopted a policy of using the inclusive naming word list v1
> [1, 2].
>
> In keeping with this policy rename the primary development branch from
> 'master' to 'main'. This patch does not actually make that change, but
> rather updates references to the branch in documentation in the source
> tree. It is intended to be applied at (approximately) the same time
> that the change is made.
>
> OVS is currently hosted on GitHub. We can expect the following behaviour
> after the rename:
>
> 1. GitHub pull requests against are renamed branch are automatically
>re-homed on new branch
> 2. GitHub Issues do not seem to be affected - at least the test issue I
>created had no association with a branch
> 3. URLs accessed via the GitHub web UI are automatically renamed
>(so long as a new branch called master is not created).
> 4. Using the git cli command, fetch will fetch the new branch (main),
>and fetch -p will remove (prune) the old branch (master)
>
> [1] df5e5cf4318a ("Documentation: Add section on inclusive language.")
> [2] https://inclusivenaming.org/word-lists/
>
> Signed-off-by: Simon Horman
Thanks this revision looks good to me.
Acked-by: Eelco Chaudron
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH v3] Documentation: Updates for rename of primary development branch as main.
Bleep bloop. Greetings Simon Horman, I am a robot and I have tried out your patch. Thanks for your contribution. I encountered some error that I wasn't expecting. See the details below. checkpatch: WARNING: The subject, ': ', is over 70 characters, i.e., 72. Subject: Documentation: Updates for rename of primary development branch as main. WARNING: Line is 110 characters long (recommended limit is 79) #374 FILE: README.rst:11: .. image:: https://ci.appveyor.com/api/projects/status/github/openvswitch/ovs?branch=main&svg=true&retina=true Lines checked: 381, Warnings: 2, Errors: 0 Please check this out. If you feel there has been an error, please email acon...@redhat.com Thanks, 0-day Robot ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
[ovs-dev] [PATCH v3] Documentation: Updates for rename of primary development branch as main.
Recently OVS adopted a policy of using the inclusive naming word list v1
[1, 2].
In keeping with this policy rename the primary development branch from
'master' to 'main'. This patch does not actually make that change, but
rather updates references to the branch in documentation in the source
tree. It is intended to be applied at (approximately) the same time
that the change is made.
OVS is currently hosted on GitHub. We can expect the following behaviour
after the rename:
1. GitHub pull requests against are renamed branch are automatically
re-homed on new branch
2. GitHub Issues do not seem to be affected - at least the test issue I
created had no association with a branch
3. URLs accessed via the GitHub web UI are automatically renamed
(so long as a new branch called master is not created).
4. Using the git cli command, fetch will fetch the new branch (main),
and fetch -p will remove (prune) the old branch (master)
[1] df5e5cf4318a ("Documentation: Add section on inclusive language.")
[2] https://inclusivenaming.org/word-lists/
Signed-off-by: Simon Horman
---
Changes in v3:
- This patch only updates documentation. Update the patch prefix and
description accordingly.
- Drop documentation of 'tested on "master" branch' rather than updating
it, as the updated text seems somewhat nonsensical.
- Correct indentation of NEWS entry.
Changes in v2:
- Keep two blank lines between versions.
- Drop bogus update to OpenSSL hashes URL in appveyor.yml.
- Drop other appveyor.yml changes, they are now present upstream.
+ appveyor: Prepare for rename of primary development branch.
https://github.com/openvswitch/ovs/commit/95ff912edef8
- Add note about updates to git configuration.
---
Notes:
* Now is the time to raise any concerns regarding this patch.
It is planned to implement this change next week.
* If you have an automation that fetches the master branch then
the suggested action is:
1. Before the branch rename occurs: update the automation to pull main an
fall back to pulling master if that fails
2. After the rename occurs: Update the automation to only fetch main
* After the change it may be necessary to update your local
git configuration for checked out branches.
For example:
# Fetch origin: new remote main branch; remote master branch is deleted
git fetch -tp origin
# Rename local branch
git branch -m master main
# Update local main branch to use remote main branch as it's upstream
git branch --set-upstream-to=origin/main main
* As a follow-up, after the rename, I plan to post a patch which removes
references to master in CI jobs
---
.../internals/committer-responsibilities.rst | 12 +++---
.../internals/contributing/backporting-patches.rst | 12 +++---
Documentation/internals/release-process.rst| 50 +++---
Documentation/intro/install/dpdk.rst | 2 +-
Documentation/intro/install/fedora.rst | 2 +-
Documentation/intro/install/general.rst| 2 +-
Documentation/intro/install/rhel.rst | 2 +-
Documentation/topics/language-bindings.rst | 2 +-
Documentation/tutorials/faucet.rst | 6 +--
Documentation/tutorials/ovs-conntrack.rst | 1 -
NEWS | 3 ++
README.rst | 2 +-
12 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/Documentation/internals/committer-responsibilities.rst
b/Documentation/internals/committer-responsibilities.rst
index c35fd708913b..eed2e017678a 100644
--- a/Documentation/internals/committer-responsibilities.rst
+++ b/Documentation/internals/committer-responsibilities.rst
@@ -73,14 +73,14 @@ If it is someone else's change, then you can ask the
original submitter to
address it. Regardless, you need to ensure that the problem is fixed in a
timely way. The definition of "timely" depends on the severity of the problem.
-If a bug is present on master and other branches, fix it on master first, then
+If a bug is present on main and other branches, fix it on main first, then
backport the fix to other branches. Straightforward backports do not require
-additional review (beyond that for the fix on master).
+additional review (beyond that for the fix on main).
-Feature development should be done only on master. Occasionally it makes sense
+Feature development should be done only on main. Occasionally it makes sense
to add a feature to the most recent release branch, before the first actual
release of that branch. These should be handled in the same way as bug fixes,
-that is, first implemented on master and then backported.
+that is, first implemented on main and then backported.
Keep the authorship of a commit clear by maintaining a correct list of
"Signed-off-by:"s. If a confusing situation comes up, as it occasionally does,
@@ -99,7 +99,7 @@ Pre-Push Hook
-
The following script can be helpful
