[lmi-commits] [lmi] master 5894e2b 1/2: Add instructions for synchronizing git with no central server

[Greg Chicares]

branch: master
commit 5894e2bbdd12d11366bb73cdc9d275dac87a86c6
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Add instructions for synchronizing git with no central server
---
 gwc/develop2.txt | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/gwc/develop2.txt b/gwc/develop2.txt
index 6a07e6e..0e63090 100644
--- a/gwc/develop2.txt
+++ b/gwc/develop2.txt
@@ -34,7 +34,7 @@ git commit --all -m"Another set of changes"
 cd /opt/lmi/proprietary
 git bundle create YourBundleName origin/master..HEAD
   # for example (substitute your own initials)
-git bundle create /opt/lmi/blessed/$(date -u +'%Y%m%dT%H%MZ')-gwc.bundle 
origin/master..HEAD --branches
+git bundle create /opt/lmi/blessed/$(date -u +'%Y%m%dT%H%MZ')-gwc.bundle 
origin/master..HEAD
 
   # Email that bundle, then push the changes to your "blessed" repository
 
@@ -50,6 +50,26 @@ git pull /path/where/you/saved/TheirBundleName master
 
 git push
 
+  # Synchronize remote from local proprietary repository
+
+  # determine the latest commit present on the remote machine
+
+cd /opt/lmi/proprietary
+git rev-parse master
+
+  # ...and paste that SHA1 into this command on the local machine
+
+cd /opt/lmi/proprietary
+git bundle create YourCatchupBundleName PASTED..master
+  # for example (assuming the remote's 'master' is e5094a5a820)
+git bundle create /srv/cache_for_lmi/blessed/$(date -u 
+'%Y%m%dT%H%MZ')-catchup.bundle e5094a5a820^..master
+
+  # ...and then, on the remote machine, verify and pull it as for
+  # "When you receive a bundle in email" above; finally, copy its
+  # source code into the directory used by the compiler:
+
+cp -ia src/* /opt/lmi/src/products/src
+
   # Whenever a rate table changes, regenerate the binary database
 
 cd /opt/lmi/data