From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Barton Subject: Re: Re: Article: Synchronizing org Files Using bzr and git Date: Wed, 11 Mar 2009 16:39:23 +0000 Message-ID: <49B7E93B.5000401@manor-farm.org> References: <49AD33E0.1070306@manor-farm.org> <3474A2F0-EAFB-4097-AB10-282D516D7681@uva.nl> <49B0FBFB.7030207@manor-farm.org> <200903111719.45738.yuval@avramzon.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LhRbQ-0004eG-Dr for emacs-orgmode@gnu.org; Wed, 11 Mar 2009 12:48:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LhRbO-0004cl-FN for emacs-orgmode@gnu.org; Wed, 11 Mar 2009 12:48:19 -0400 Received: from [199.232.76.173] (port=45539 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LhRbO-0004cZ-7Q for emacs-orgmode@gnu.org; Wed, 11 Mar 2009 12:48:18 -0400 Received: from a2s22.a2hosting.com ([69.39.86.130]:45311) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LhRbN-000748-PF for emacs-orgmode@gnu.org; Wed, 11 Mar 2009 12:48:18 -0400 In-Reply-To: <200903111719.45738.yuval@avramzon.net> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Yuval Hager Cc: emacs-orgmode@gnu.org > One thing that confused me is that I tried to work with two machines, > without a server. Figuring git is distributed, I thought I do not need a > server, and I tried to follow the tutorial. Obviously, I got hit when I > performed a 'git push' onto a non-bare repository (now I know what these > things mean ;). > I now know not to use 'push' and can get along fine with just 'pull'-ing. I > think the tutorial might be better if you either mention how to work > without a server, or just put a big note not to push onto a non-server > branch (There is a note there, but it was probably not big enough for me ;) > > Thanks for a great tutorial. You made me cross the git barrier. Once I'm on > the other side, nothing would take me back (same way I felt about org-mode > after seeing Russell Adams' video). Yuval, Thanks for the comments. I want to improve the git section. One thing that's easy with bzr is to just push your changes to a remote server, or a usb stick in one operation, even if the remote repo doesn't exist. Using git this seems to be problematic. You can't use push unless there is a repo already there. You can create a blank repo ready to push into, but for the lazy this requires two steps instead on one. It is supposed to be possible to use git clone to create the repo and populate in a single step. However, I seem to fall into a syntactic black hole here and just end up creating a new repo locally. Ian.