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: Rewriting bzrmerge.el Date: Sun, 23 Nov 2014 22:59:03 -0500 Message-ID: References: <20141027000718.F09B5382A66@snark.thyrsus.com> <87bno8y0rt.fsf_-_@engster.org> <871tp4xx4i.fsf@engster.org> <87tx20whtq.fsf@engster.org> <87lhn4rx0v.fsf@engster.org> <838uj3tztm.fsf@gnu.org> <87egsvrz6e.fsf@engster.org> <83mw7jrxt9.fsf@gnu.org> <87a93jrw83.fsf@engster.org> <83ioi7rn9o.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416801567 28112 80.91.229.3 (24 Nov 2014 03:59:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 24 Nov 2014 03:59:27 +0000 (UTC) Cc: esr@thyrsus.com, Eli Zaretskii , David Engster , emacs-devel@gnu.org To: Lars Magne Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 24 04:59:20 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 1Xsko3-0003c7-JK for ged-emacs-devel@m.gmane.org; Mon, 24 Nov 2014 04:59:19 +0100 Original-Received: from localhost ([::1]:50732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsko3-0000T1-9L for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 22:59:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsknv-0000Sq-9T for emacs-devel@gnu.org; Sun, 23 Nov 2014 22:59:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xsknp-0004TV-4z for emacs-devel@gnu.org; Sun, 23 Nov 2014 22:59:11 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:60227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsknp-0004TQ-0e; Sun, 23 Nov 2014 22:59:05 -0500 Original-Received: from fmsmemgm.homelinux.net (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id sAO3x3qG008285; Sun, 23 Nov 2014 22:59:03 -0500 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 19031AE0A5; Sun, 23 Nov 2014 22:59:03 -0500 (EST) In-Reply-To: (Lars Magne Ingebrigtsen's message of "Sun, 23 Nov 2014 00:02:18 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Level: X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.7 X-NAI-Spam-Rules: 4 Rules triggered WB_LK3_SLK=0.3, GEN_SPAM_FEATRE=0.2, WB_LK3_SLK_W_GEN_SPAM_FEATRE=0.2, RV5134=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5134> : inlines <1555> : streams <1347317> : uri <1835821> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 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:178144 Archived-At: Could you guys move this to some other thread. gitmerge.el is unrelated to the issue of multiple checkout or not, since it works on branches not on checkouts. Stefan >>>>> "Lars" == Lars Magne Ingebrigtsen writes: > Eli Zaretskii writes: >> I'm going to recommend on the Wiki that people who don't consider >> themselves advanced/experienced Git users clone the repository twice, >> in which case they most probably won't have a checkout of emacs-24 in >> the clone where they work on master, and vice versa. >> From previous discussion on this list, it seems like most people don't > want to download the repository twice (or store two copies of it on > disk), so they want a different workflow. > It would be nice it it were possible to provide them with that. > -- > (domestic pets only, the antidote for overdose, milk.) > bloggy blog: http://lars.ingebrigtsen.no