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: Rewriting bzrmerge.el Date: Sat, 22 Nov 2014 22:11:18 +0100 Message-ID: <87389brle1.fsf@engster.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416690725 12235 80.91.229.3 (22 Nov 2014 21:12:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 21:12:05 +0000 (UTC) Cc: esr@thyrsus.com, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 22:11:59 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 1XsHyG-0007Ze-33 for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 22:11:56 +0100 Original-Received: from localhost ([::1]:46756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsHyF-0003o3-KH for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 16:11:55 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsHxw-0003nx-P4 for emacs-devel@gnu.org; Sat, 22 Nov 2014 16:11:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsHxo-0007V7-BU for emacs-devel@gnu.org; Sat, 22 Nov 2014 16:11:36 -0500 Original-Received: from randomsample.de ([5.45.97.173]:50891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsHxo-0007Un-23; Sat, 22 Nov 2014 16:11:28 -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=QhSWLEJ7e1LT9JvvPXHhoJ4dZ4hYzsW53vaxbTnt+hU=; b=M6jUZkkGGrvd731MVX63IktJ0yfcm0VNS/WN8EphVD3x14rBfpZnQjuxuT6tLeajePeapH/G2yI0Mlly3GulPOwUAanzv9mwHH8p3Wnor5nZNRUmUYpeq4/pCn2/BWJD; Original-Received: from ip4d154d80.dynamic.kabel-deutschland.de ([77.21.77.128] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XsHxk-0008Hh-DQ; Sat, 22 Nov 2014 22:11:24 +0100 In-Reply-To: <83ioi7rn9o.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 22 Nov 2014 22:30:43 +0200") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) 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:178038 Archived-At: 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. If there are problems with git-new-workdir, that's probably for the best. I've never really used it, especially not on Windows. >> If you follow admin/notes/git-workflow and create a separate >> checkout of the emacs-24 branch, you will automatically have a local >> tracking branch emacs-24 (also in 'trunk'). > > Following admin/notes/git-workflow is not a requirement, it's an > advice. IMO, gitmerge.el should work even without that, at least > ideally. It will always be able to merge origin/emacs-24. I guess you could set things up to merge from a second, separate clone (by adding it as a remote), but I don't see the need. >> You'll be able to do either. For git it makes no difference whether you >> merge a local or a remote branch. > > I didn't mean me, I meant gitmerge.el. If it always uses > origin/emacs-24, it will work regardless of whether there is a > checkout of emacs-24. So I think this is more reliable. At the moment, gitmerge will ask you what branch to merge with a completing-read, where you can choose from a list of all local and remote branches (they can optionally be filtered through a regexp). The branch 'origin/emacs-24' is now set as INITIAL-INPUT, since this will be the main purpose of gitmerge (for now). Are you OK with that? -David