adding pull to push repo downstream

found we needed to pull the remote version of the downstream master at times.  not sure exactly why yet, but added a chunk to do this.
also ZSorter is temporary demo of a simple sorter method.

diff --git a/graphiq/.settings/language.settings.xml b/graphiq/.settings/language.settings.xml
index 043e928711659e4a03048d22ab215a89d59954ed..c65707132bef1bf5100bd3a1de9635bd548ff6a5 100644 (file)
--- a/graphiq/.settings/language.settings.xml
+++ b/graphiq/.settings/language.settings.xml
@@ -5,7 +5,7 @@
                        <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
                        <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
                        <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-                       <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1666518130664051752" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+                       <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1260941817250426252" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
                                <language-scope id="org.eclipse.cdt.core.gcc"/>
                                <language-scope id="org.eclipse.cdt.core.g++"/>
                        </provider>

diff --git a/kona/src/org/feistymeow/example/ZSorter.java b/kona/src/org/feistymeow/example/ZSorter.java
new file mode 100644 (file)
index 0000000..f9a38d4
--- /dev/null
+++ b/kona/src/org/feistymeow/example/ZSorter.java
@@ -0,0 +1,47 @@
+package org.feistymeow.example;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class ZSorter<T extends Comparable<? super T>> {
+
+       /**
+        * returns a new list which is the sorted version of the input
+        * list "toSort".
+        */
+       public List<T> sort(List<T> toSort) {
+               List<T> toReturn = new ArrayList<T>(toSort);
+               Collections.copy(toReturn, toSort);
+               Collections.sort(toReturn);
+               return toReturn;
+       }
+
+       /**
+        * simple console printer for list of T.
+        */
+       public void print(List<T> toPrint) {
+               boolean first = true;
+               for (T curr: toPrint) {
+                       if (!first) System.out.print(", ");
+                       first = false;
+                       System.out.print(curr);
+               }
+               System.out.println();
+       }
+       
+       public static void main(String[] args) {
+               ZSorter<Integer> sorter = new ZSorter<Integer>();
+               
+               List<Integer> theList
+                       = new ArrayList<Integer>(Arrays.asList(101, 19, 86, 72, 56, 35, 47));
+               System.out.println("prior to sorting:");
+               sorter.print(theList);
+
+               // test our sort method.
+               List<Integer> newList = sorter.sort(theList);
+               System.out.println("after sorting:");
+               sorter.print(newList);
+       }
+}

diff --git a/nucleus/.settings/language.settings.xml b/nucleus/.settings/language.settings.xml
index aea5d89609493144d9ba5a36ef01ae5ea14f31ee..0d6789c9ee51dd01c2b794f92408b64a00a1c6ef 100644 (file)
--- a/nucleus/.settings/language.settings.xml
+++ b/nucleus/.settings/language.settings.xml
@@ -5,7 +5,7 @@
                        <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
                        <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
                        <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-                       <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1666518130664051752" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+                       <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1260941817250426252" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
                                <language-scope id="org.eclipse.cdt.core.gcc"/>
                                <language-scope id="org.eclipse.cdt.core.g++"/>
                        </provider>

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index b2da88704a60f4ace4290f638e8be69cc1eb6030..b9c0620324b7b39947d98e999ad5f10698454187 100644 (file)
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -51,9 +51,14 @@ test_or_die "generating revision control file list"
 perform_revctrl_action_on_file "$tempfile" do_careful_git_update
 test_or_die "doing a careful git update on: $tempfile"
 
+# seems to be needed to cause a merge to be resolved.
+git pull downstream master
+# -m "unfortunate merge"
+test_or_die "running the git pull downstream master"
+
 # send our little boat down the stream to the dependent repository.
 git push downstream master
-test_or_die "running the git push downstream"
+test_or_die "running the git push downstream master"
 
 popd &>/dev/null