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: [mentoring-done] a darkroom/writeroom mode for Emacs Date: Mon, 15 Dec 2014 09:38:33 -0500 Message-ID: References: <20141203142859.24393.98673@vcs.savannah.gnu.org> <83y4qm2uz9.fsf@gnu.org> <83vblq2los.fsf@gnu.org> <87vblpjq24.fsf@uwakimon.sk.tsukuba.ac.jp> <83mw7119yz.fsf@gnu.org> <87sigqiaaz.fsf@gmx.us> <878uihhv5q.fsf@gmx.us> <87bnnczcjg.fsf@gmx.us> <87bnna11ez.fsf@pank.eu> <87wq5xxe6g.fsf@gmx.us> <86zjap6p0c.fsf@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418654347 24326 80.91.229.3 (15 Dec 2014 14:39:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 15 Dec 2014 14:39:07 +0000 (UTC) Cc: emacs-devel@gnu.org, Rasmus , Dmitry Gutov To: joaotavora@gmail.com (=?windows-1252?B?Sm/jbyBU4XZvcmE=?=) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 15 15:38: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 1Y0WnV-0008Fs-Eq for ged-emacs-devel@m.gmane.org; Mon, 15 Dec 2014 15:38:53 +0100 Original-Received: from localhost ([::1]:40026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WnV-0000zV-1A for ged-emacs-devel@m.gmane.org; Mon, 15 Dec 2014 09:38:53 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WnK-0000xn-BR for emacs-devel@gnu.org; Mon, 15 Dec 2014 09:38:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0WnC-0006b5-S9 for emacs-devel@gnu.org; Mon, 15 Dec 2014 09:38:42 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:6608) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WnC-0006b1-Nu for emacs-devel@gnu.org; Mon, 15 Dec 2014 09:38:34 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AjsPAOwQflTO+ILA/2dsb2JhbABbgweDYIVaxR0EAgKBJBcBAQEBAQF8hAMBAQMBViMFCws0EhQYDYhuCdZZAQEBAQYBAQEBHpBvB4RIBYsBpC6BeIQZIYJ3AQEB X-IPAS-Result: AjsPAOwQflTO+ILA/2dsb2JhbABbgweDYIVaxR0EAgKBJBcBAQEBAQF8hAMBAQMBViMFCws0EhQYDYhuCdZZAQEBAQYBAQEBHpBvB4RIBYsBpC6BeIQZIYJ3AQEB X-IronPort-AV: E=Sophos;i="5.07,502,1413259200"; d="scan'208";a="102528911" Original-Received: from 206-248-130-192.dsl.teksavvy.com (HELO ceviche.home) ([206.248.130.192]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 15 Dec 2014 09:38:33 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 4EC26660D3; Mon, 15 Dec 2014 09:38:33 -0500 (EST) In-Reply-To: (=?windows-1252?Q?=22Jo=E3o_T=E1v?= =?windows-1252?Q?ora=22's?= message of "Mon, 15 Dec 2014 13:20:35 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:180153 Archived-At: >> Personally, I use `git subtree merge'. IIRC, Stefan usually does `git merge >> --strategy=subtree` instead. Actually, nowadays, rather than --strategy=subtree I more often use an explicit "-X subtree=packages/foo" so Git doesn't have to guess (this is particularly important in the initial merge, where Git can't really guess). > Can you explain if this fundamentally different from my strategy, or is My strategy is indeed the "same as yours", except that the "mv" are performed by Git, but that makes a hell of a difference in terms of conflict resolution. IIUC the "git subtree merge" approach is somewhat similar except that the merge metadata is thrown away and replaced by a "note" in the log the remember which external revision was merged. Stefan