From b4f6c54a3726553a6f0f6c2ba017d0195c01344d Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 20 Aug 2020 09:46:03 -0400 Subject: [PATCH] moved branch name impacts tossed out "master" branch in favor of "main" branch. these files are modified for that specific reason or for similar reasons. --- .../feisty_meow_command_reference.txt | 2 +- documentation/feisty_meow_dox.config | 2 +- .../cron/synch_and_swim_downstream.crontab | 2 +- ...o_push_existing_git_repo_to_new_target.txt | 3 +-- .../system/RegistryEditorTestCase.java | 2 +- scripts/rev_control/push_repo_downstream.sh | 8 +++--- scripts/rev_control/quick_git_release.sh | 26 +++++++++---------- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/documentation/feisty_meow_command_reference.txt b/documentation/feisty_meow_command_reference.txt index 21de010d..796f7e65 100644 --- a/documentation/feisty_meow_command_reference.txt +++ b/documentation/feisty_meow_command_reference.txt @@ -126,7 +126,7 @@ some assorted other revision control commands: pushd $FEISTY_MEOW_APEX; git checkout dev; popd and this command will get you back onto the mainline branch: - pushd $FEISTY_MEOW_APEX; git checkout master; popd + pushd $FEISTY_MEOW_APEX; git checkout main; popd ============================= the site avenger script suite diff --git a/documentation/feisty_meow_dox.config b/documentation/feisty_meow_dox.config index 1566a350..be74437c 100644 --- a/documentation/feisty_meow_dox.config +++ b/documentation/feisty_meow_dox.config @@ -685,7 +685,7 @@ HHC_LOCATION = # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag # controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). +# it should be included in the main .chm file (NO). GENERATE_CHI = NO diff --git a/infobase/configuration/cron/synch_and_swim_downstream.crontab b/infobase/configuration/cron/synch_and_swim_downstream.crontab index 196d241f..5b43e790 100644 --- a/infobase/configuration/cron/synch_and_swim_downstream.crontab +++ b/infobase/configuration/cron/synch_and_swim_downstream.crontab @@ -2,7 +2,7 @@ ############## #[synch and swim downstream] -# updates local code repositories from master versions before uploading any changes to downstream +# updates local code repositories from main versions before uploading any changes to downstream # repositories, such as sourceforge or github. the uploading process (which we think of as sending # those updated items swimming downstream to their dependent repositories) is done automatically in # our makefiles. that's why the code below relies on the top-level makefile in home. diff --git a/infobase/configuration/git/how_to_push_existing_git_repo_to_new_target.txt b/infobase/configuration/git/how_to_push_existing_git_repo_to_new_target.txt index ea1d4889..504fedf8 100644 --- a/infobase/configuration/git/how_to_push_existing_git_repo_to_new_target.txt +++ b/infobase/configuration/git/how_to_push_existing_git_repo_to_new_target.txt @@ -9,7 +9,6 @@ git remote add github https://github.com/fredhamster/feisty_meow.git git remote -v # stuff the repository contents up to the target. -git push github master - +git push github main diff --git a/kona/src/org/feistymeow/system/RegistryEditorTestCase.java b/kona/src/org/feistymeow/system/RegistryEditorTestCase.java index e26927b8..7813f8ea 100644 --- a/kona/src/org/feistymeow/system/RegistryEditorTestCase.java +++ b/kona/src/org/feistymeow/system/RegistryEditorTestCase.java @@ -60,7 +60,7 @@ public class RegistryEditorTestCase @Test public void testSetValueAndRemove_AllWork() { - String EXAMPLE_KEY_ROOT = "HKCU\\Software\\SpunkMaster5000"; + String EXAMPLE_KEY_ROOT = "HKCU\\Software\\SpunkBaster5000"; String EXAMPLE_KEY = EXAMPLE_KEY_ROOT + "\\traumix"; String EXAMPLE_VALUE = "glonkish"; String EXAMPLE_CONTENTS1 = "ralphWiggum!"; diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index 1fc6e0ba..0135a404 100644 --- a/scripts/rev_control/push_repo_downstream.sh +++ b/scripts/rev_control/push_repo_downstream.sh @@ -56,13 +56,13 @@ exit_on_error "doing a careful update on: $tempfile" rm "$tempfile" # seems to be needed to cause a merge to be resolved. -git pull downstream master +git pull downstream main # -m "unfortunate merge" -exit_on_error "running the git pull downstream master" +exit_on_error "running the git pull downstream main" # send our little boat down the stream to the dependent repository. -git push --tags downstream master -exit_on_error "running the git push downstream master" +git push --tags downstream main +exit_on_error "running the git push downstream main" # do our dev branch also. git push --tags downstream dev diff --git a/scripts/rev_control/quick_git_release.sh b/scripts/rev_control/quick_git_release.sh index 1b6976a9..e37aca80 100644 --- a/scripts/rev_control/quick_git_release.sh +++ b/scripts/rev_control/quick_git_release.sh @@ -1,6 +1,6 @@ #!/bin/bash -# a simple and quick method for making a new release, merging it into the master branch, +# a simple and quick method for making a new release, merging it into the main branch, # and tagging it with a new tag for the release. # currently needs to be told the new release name, which is actually also gotten from # the "next_version" script. if these differ, there will be confusion for users about @@ -15,7 +15,7 @@ source $FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh # + better if we could get the version automatically, but there is a circular dependency where we want to check out the new branch by version number. # these are the steps i take on feisty meow when i have a dev branch that is -# ready to merge in to the master branch as a new release. the process +# ready to merge in to the main branch as a new release. the process # includes adding the tag for the new release and such. there are manual # steps for adding the commit comments, including an introspection phase # with gitk before the release commit comment is created. @@ -69,20 +69,20 @@ branch name and release tag name of the new release. #read line git push --set-upstream origin "$new_release" - # grab out the master branch as the active one. -#echo about to check out master--hit enter + # grab out the main branch as the active one. +#echo about to check out main--hit enter #read line - git checkout master - exit_on_error checking out master branch + git checkout main + exit_on_error checking out main branch rpuffer - exit_on_error running rpuffer on master branch to update it + exit_on_error running rpuffer on main branch to update it - # merge the master branch with the new release. + # merge the main branch with the new release. #echo about to merge--hit enter #read line git merge --no-ff $new_release - exit_on_error merging in the new release in master + exit_on_error merging in the new release in main # let the committer see the most recent changes. echo @@ -100,11 +100,11 @@ branch name and release tag name of the new release. git tag -a $new_version exit_on_error tagging new version as $new_version - # commit the full set of changes for the master branch now, including the tags. -#echo about to commit master branch with all those changes--hit enter + # commit the full set of changes for the main branch now, including the tags. +#echo about to commit main branch with all those changes--hit enter #read line rcheckin . - exit_on_error checking in the changes in master branch + exit_on_error checking in the changes in main branch # switch back to the dev branch. #echo switching to dev branch--hit enter @@ -112,7 +112,7 @@ branch name and release tag name of the new release. git checkout dev exit_on_error checking the dev branch out again - # merge in the latest changes from master, which should only be the revised version really. + # merge in the latest changes from main, which should only be the revised version really. #echo merging in from release branch to dev--hit enter #read line git merge --no-ff $new_release -- 2.34.1