From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: On the subject of Git, Bazaar, and the future of Emacs development Date: Thu, 28 Mar 2013 08:27:00 -0400 Message-ID: References: <87y5d9p5td.fsf@dex.adm.naquadah.org> <87vc8dtbcb.fsf@lifelogs.com> <871ub1gmdf.fsf@engster.org> <87d2ulovd0.fsf@dex.adm.naquadah.org> <85r4j0h1ww.fsf@member.fsf.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1364473629 18994 80.91.229.3 (28 Mar 2013 12:27:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Mar 2013 12:27:09 +0000 (UTC) Cc: Stephen Leake , emacs-devel@gnu.org To: Kolo Rahl Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 28 13:27:35 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ULBvW-0008LP-Lc for ged-emacs-devel@m.gmane.org; Thu, 28 Mar 2013 13:27:30 +0100 Original-Received: from localhost ([::1]:37098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULBv8-00043U-Fb for ged-emacs-devel@m.gmane.org; Thu, 28 Mar 2013 08:27:06 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:58720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULBv4-00043P-OP for emacs-devel@gnu.org; Thu, 28 Mar 2013 08:27:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULBv3-0001FY-IO for emacs-devel@gnu.org; Thu, 28 Mar 2013 08:27:02 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:54980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULBv3-0001FP-Ed for emacs-devel@gnu.org; Thu, 28 Mar 2013 08:27:01 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AhAKABK/CFFFxLSu/2dsb2JhbABEvgwEA3sXc4IeAQEEAVYjBQsLNBIUGA0kiB4GwS2RCgOkeoFegxM X-IPAS-Result: AhAKABK/CFFFxLSu/2dsb2JhbABEvgwEA3sXc4IeAQEEAVYjBQsLNBIUGA0kiB4GwS2RCgOkeoFegxM X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="5977059" Original-Received: from 69-196-180-174.dsl.teksavvy.com (HELO pastel.home) ([69.196.180.174]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 28 Mar 2013 08:26:58 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 15805678D0; Thu, 28 Mar 2013 08:27:00 -0400 (EDT) In-Reply-To: (Kolo Rahl's message of "Wed, 27 Mar 2013 20:22:19 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:158353 Archived-At: > Question about these "bidirectional" merge situations: how often do they > happen and what is an example of one? Sync'ing Emacs and CEDET, or Emacs and Gnus, or ... Stefan