From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/80513 Path: news.gmane.org!not-for-mail From: Dave Abrahams Newsgroups: gmane.emacs.gnus.general Subject: Re: *bump* again Date: Fri, 04 Nov 2011 07:30:36 -0800 Message-ID: References: <1318133487-45386-1-git-send-email-dave@boostpro.com> <82botobfzu.fsf@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1320420778 28070 80.91.229.12 (4 Nov 2011 15:32:58 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 4 Nov 2011 15:32:58 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M28796@lists.math.uh.edu Fri Nov 04 16:32:54 2011 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RMLlF-0002qa-GH for ding-account@gmane.org; Fri, 04 Nov 2011 16:32:53 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1RMLkO-0002DK-7a; Fri, 04 Nov 2011 10:32:00 -0500 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1RMLkM-0002D8-Ue for ding@lists.math.uh.edu; Fri, 04 Nov 2011 10:31:58 -0500 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RMLkL-0001AB-IX for ding@lists.math.uh.edu; Fri, 04 Nov 2011 10:31:58 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RMLkI-0003Nd-O5 for ding@gnus.org; Fri, 04 Nov 2011 16:31:54 +0100 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1RMLkI-0002HH-L8 for ding@gnus.org; Fri, 04 Nov 2011 16:31:54 +0100 Original-Received: from 129-134-58-66.gci.net ([66.58.134.129]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 04 Nov 2011 16:31:54 +0100 Original-Received: from dave by 129-134-58-66.gci.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 04 Nov 2011 16:31:54 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 28 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 129-134-58-66.gci.net User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/23.3 (darwin) Cancel-Lock: sha1:TlGsaLI1hRLgMGZOvI4F6/qnFjw= X-Spam-Score: -6.1 (------) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:80513 Archived-At: on Fri Nov 04 2011, Steinar Bang wrote: >>>>>> Dave Abrahams : > >> You don't have a development/integration branch where things can go >> during a feature freeze? > > Note to Lars: having separate branches and merging between them is > _much_ less of a hazzle than in traditional version control tools (CVS, > subversion, perforce). I know this by first hand experience. > > When you do get a conflict, git isn't any smarter than other version > control tools, but git is quiet clever at avoiding conflicts. And magit makes resolution pretty painless. > The development branch should be frequently merged with master, though. > Maybe a bot could do it, with notifications to a human operator when it > gets conflicts? It would be simpler if the development branch *was* master and one could branch for release, instead. -- Dave Abrahams BoostPro Computing http://www.boostpro.com