From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Rewriting bzrmerge.el Date: Sun, 23 Nov 2014 05:46:32 +0200 Message-ID: <83egsushnr.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416714423 5519 80.91.229.3 (23 Nov 2014 03:47:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 23 Nov 2014 03:47:03 +0000 (UTC) Cc: esr@thyrsus.com, monnier@iro.umontreal.ca, deng@randomsample.de, emacs-devel@gnu.org To: Lars Magne Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 23 04:46:52 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 1XsO8P-0001ah-Nm for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 04:46:49 +0100 Original-Received: from localhost ([::1]:47577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsO8P-0008Qb-9e for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 22:46:49 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsO88-0008QP-9H for emacs-devel@gnu.org; Sat, 22 Nov 2014 22:46:37 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsO83-0003fu-Fn for emacs-devel@gnu.org; Sat, 22 Nov 2014 22:46:32 -0500 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:59835) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsO83-0003fe-7x for emacs-devel@gnu.org; Sat, 22 Nov 2014 22:46:27 -0500 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NFH00J002ZN1V00@mtaout28.012.net.il> for emacs-devel@gnu.org; Sun, 23 Nov 2014 05:43:53 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFH00HGW3P5YI30@mtaout28.012.net.il>; Sun, 23 Nov 2014 05:43:53 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.184 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:178057 Archived-At: > From: Lars Magne Ingebrigtsen > Cc: David Engster , esr@thyrsus.com, monnier@iro.umontreal.ca, emacs-devel@gnu.org > Date: Sun, 23 Nov 2014 00:02:18 +0100 > > 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. There's any number of ways to handle this problem with Git. We cannot possibly describe all of them on the Wiki, not without confusing the heck out of the reader. Experienced Git users will be able to find the way that suits them even without reading the Wiki. In any case, I will mention git-new-workdir, which seems to be the other popular method. And there's always a possibility of changing the recommendations in the future, if experience shows that changes are needed.