From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Move to git is imminent - awaiting Stefan's approval Date: Thu, 09 Jan 2014 08:32:31 +0100 Message-ID: <87k3e9y5io.fsf@engster.org> References: <20140106165108.B6BF4380865@snark.thyrsus.com> <83zjn9rpaz.fsf@gnu.org> <20140108161250.6449a8ff@anarchist.wooz.org> <83iottekc2.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389252771 2681 80.91.229.3 (9 Jan 2014 07:32:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 9 Jan 2014 07:32:51 +0000 (UTC) Cc: barry@python.org, Stefan Monnier , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 09 08:32:58 2014 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 1W1A6r-0006vD-BT for ged-emacs-devel@m.gmane.org; Thu, 09 Jan 2014 08:32:57 +0100 Original-Received: from localhost ([::1]:50442 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1A6q-0003Xd-Qe for ged-emacs-devel@m.gmane.org; Thu, 09 Jan 2014 02:32:56 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1A6k-0003XL-Bl for emacs-devel@gnu.org; Thu, 09 Jan 2014 02:32:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W1A6f-0005bH-Kn for emacs-devel@gnu.org; Thu, 09 Jan 2014 02:32:50 -0500 Original-Received: from randomsample.de ([5.45.97.173]:36191) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1A6f-0005b2-Et; Thu, 09 Jan 2014 02:32:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=8ymMAaJYLU1uIlrM/x0NPvcb0jEONNKAy7Ci+WyDw1I=; b=LaOGLZeEBpulDnrzXymBtTSesJPXFdz80fSFOA7/se0CDB1OgQ+aiu6rKGWoMKUasL+lo18dw/uJqdvG3B9hNzS/ZvGpv3v67xB+VPVC8HqOxmNwjUn1651vZDKBkY+u; Original-Received: from dslc-082-083-043-217.pools.arcor-ip.net ([82.83.43.217] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1W1A6b-00024c-0d; Thu, 09 Jan 2014 08:32:41 +0100 In-Reply-To: <83iottekc2.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 09 Jan 2014 08:32:45 +0200") User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3 (gnu/linux) Mail-Followup-To: Eli Zaretskii , Stefan Monnier , barry@python.org, emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:167867 Archived-At: Eli Zaretskii writes: >> From: Stefan Monnier >> Date: Wed, 08 Jan 2014 19:04:34 -0500 >> Cc: emacs-devel@gnu.org >> >> > Yes please! It's one huge feature I'm missing when working in git repos as >> > opposed to bzr repos. >> >> I'm so glad to see people like it! > > Count me in as well. Great feature, indeed: seamless, does it job > silently and well. When I first saw it, and "bzr conflicts" suddenly > said nothing at all after saving a fixed file, it was one of those WTF > moments. I always thought it was a Bazaar feature... -David