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 <ho...@ovn.org> > > > --- > > > 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 <i.maxim...@ovn.org> > > > > > > > > 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