tossed out "master" branch in favor of "main" branch. these files are modified for that specific reason or for similar reasons.
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 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
=============================
the site avenger script suite
# 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
# 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).
##############
#[synch and swim downstream]
##############
#[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.
# 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.
git remote -v
# stuff the repository contents up to the target.
git remote -v
# stuff the repository contents up to the target.
-git push github master
-
@Test\r
public void testSetValueAndRemove_AllWork()\r
{\r
@Test\r
public void testSetValueAndRemove_AllWork()\r
{\r
- String EXAMPLE_KEY_ROOT = "HKCU\\Software\\SpunkMaster5000";\r
+ String EXAMPLE_KEY_ROOT = "HKCU\\Software\\SpunkBaster5000";\r
String EXAMPLE_KEY = EXAMPLE_KEY_ROOT + "\\traumix";\r
String EXAMPLE_VALUE = "glonkish";\r
String EXAMPLE_CONTENTS1 = "ralphWiggum!";\r
String EXAMPLE_KEY = EXAMPLE_KEY_ROOT + "\\traumix";\r
String EXAMPLE_VALUE = "glonkish";\r
String EXAMPLE_CONTENTS1 = "ralphWiggum!";\r
rm "$tempfile"
# seems to be needed to cause a merge to be resolved.
rm "$tempfile"
# seems to be needed to cause a merge to be resolved.
-git pull downstream master
+git pull downstream main
-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.
# 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
# do our dev branch also.
git push --tags downstream dev
-# 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
# 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
# + 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
# + 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.
# 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.
#read line
git push --set-upstream origin "$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
- git checkout master
- exit_on_error checking out master branch
+ git checkout main
+ exit_on_error checking out main branch
- 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
#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
# let the committer see the most recent changes.
echo
git tag -a $new_version
exit_on_error tagging new version as $new_version
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
- 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
# switch back to the dev branch.
#echo switching to dev branch--hit enter
git checkout dev
exit_on_error checking the dev branch out again
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
#echo merging in from release branch to dev--hit enter
#read line
git merge --no-ff $new_release