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: Sat, 22 Nov 2014 22:30:43 +0200 Message-ID: <83ioi7rn9o.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416688271 27681 80.91.229.3 (22 Nov 2014 20:31:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 20:31:11 +0000 (UTC) Cc: esr@thyrsus.com, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 21:31:03 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 1XsHKg-0000K2-VK for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 21:31:03 +0100 Original-Received: from localhost ([::1]:46683 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsHKg-0006j8-Fd for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 15:31:02 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsHKP-0006j1-CW for emacs-devel@gnu.org; Sat, 22 Nov 2014 15:30:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsHKK-0004I4-CJ for emacs-devel@gnu.org; Sat, 22 Nov 2014 15:30:45 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:39750) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsHKK-0004Hk-39 for emacs-devel@gnu.org; Sat, 22 Nov 2014 15:30:40 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NFG00F00JCQ5A00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 22 Nov 2014 22:30:38 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFG00F7HJN15D10@a-mtaout22.012.net.il>; Sat, 22 Nov 2014 22:30:38 +0200 (IST) In-reply-to: <87a93jrw83.fsf@engster.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:178037 Archived-At: > From: David Engster > Cc: monnier@iro.umontreal.ca, esr@thyrsus.com, emacs-devel@gnu.org > Date: Sat, 22 Nov 2014 18:17:16 +0100 > > >> The 'trunk' checkout should also have a local tracking branch > >> 'emacs-24'. > > > > I don't think it's a good idea to rely on that, because it's something > > that's too easy to forget. > > That's a misunderstanding. The above was not meant as a requirement, but > as a consequence of using git-new-workdir. I don't think we should rely on git-new-workdir, either. First, it doesn't work well on Windows, so the few frequent contributors (including yours truly) who work on that system will be unable to use it. And second, it's a contrib/ script, i.e. not really official yet, and has a few caveats (see past discussions). 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 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. > That's why gitmerge.el doesn't have to detect anything. It simply can > do its work in 'trunk'. AFAIU, not if there's no checkout of emacs-24 there. > >> Alternatively, we could default to merge origin/emacs-24, which > >> wouldn't even require a local tracking branch. > > > > Yes, please, let's do that. > > 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.