From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Troxel Subject: Re: Keeping up to date Date: Tue, 29 Apr 2014 12:44:26 -0400 Message-ID: References: <20140429161623.GA72660@pdavismbp15.iscinternal.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfB8y-0007ha-JJ for emacs-orgmode@gnu.org; Tue, 29 Apr 2014 12:44:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WfB8t-0006oN-HK for emacs-orgmode@gnu.org; Tue, 29 Apr 2014 12:44:32 -0400 Received: from fnord.ir.bbn.com ([192.1.100.210]:61536) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfB8t-0006oG-Cm for emacs-orgmode@gnu.org; Tue, 29 Apr 2014 12:44:27 -0400 In-Reply-To: <20140429161623.GA72660@pdavismbp15.iscinternal.com> (Peter Davis's message of "Tue, 29 Apr 2014 12:16:23 -0400") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Peter Davis Cc: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Peter Davis writes: > A while ago, I switched from ELPA to Git as my Org-mode > source. However, I now have three Macs I'm trying to keep in sync, and > doing Git updates is definitely more labor intensive. Any suggestions > for good ways to keep three machines all up-to-date with Emacs and > Org? I use git to obtain org mode. For me, the tricky part is choosing which branch and when to update. Actually doing "git update" is easy. So I'd recommend: set "core.logallrefupdates =3D true" on all git repos on a well-connected server machine, clone the official repo, and checkout maint. on other machines, clone the first. when you want to update, create a tag 'stable-yyyymmdd' on the main machine. update and ff-merge to the latest maint. Test. If you have issues, git reset --hard stable-yyyymmdd. If you're happy, git remote update/merge (pull) on the others. That's basically what I do. I find the real work is resolving any issues From=20the update and deciding if it's safe. I used to follow master, not maint, so it was probably scarier there. > I suppose the best thing would be to put all my emacs stuff in a > Dropbox folder and run from that, but I haven't managed to overcome > the inertia to get that working. Do you mean your .org files or the sources for org? I don't see how git is unsuitable for the "get sources" part. I use it for .org files too (separate repo of course), and have a script to autocommit/push every morning on the main machine I edit on. One could use a distributed filesystem instead; I haven't tried the owncloud client (and wouldn't want to put any bits with confidentiality needs on dropbox). --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlNf1uoACgkQ+vesoDJhHiVrMwCfcbJinHi9QgmydJNLOti12DBn PFUAoIJlBxSJZ3t9CeG0AqcQ81u2fwKP =Xa9W -----END PGP SIGNATURE----- --=-=-=--