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: Sun, 23 Nov 2014 18:49:59 +0100 Message-ID: <87oarxrem0.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> <87389brle1.fsf@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416765045 12118 80.91.229.3 (23 Nov 2014 17:50:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 23 Nov 2014 17:50:45 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 23 18:50:38 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 1XsbIy-0005E3-TI for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 18:50:37 +0100 Original-Received: from localhost ([::1]:49529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsbIy-0008Ld-J2 for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 12:50:36 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsbIY-0007wL-Tf for emacs-devel@gnu.org; Sun, 23 Nov 2014 12:50:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsbIS-0005Ww-Np for emacs-devel@gnu.org; Sun, 23 Nov 2014 12:50:10 -0500 Original-Received: from randomsample.de ([5.45.97.173]:51735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsbIS-0005Sn-6N for emacs-devel@gnu.org; Sun, 23 Nov 2014 12:50:04 -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=3EuYm+ACsFQm4M4rXkuBwrjIdPld4+tJz1ZSNG1LOz4=; b=PYjSij/IJ/Lv2xos13zSqji0sgL0syS2j5GRQ3SSeQk9yb+ZsHvwTxySXoRORwvIUJiXHZG/0b5PJkVtSKrog8+ey9Pu0IdhBLHHiyY8YYMY8nc6GNfyclFamPTlrOAR; 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 1XsbIQ-0002Xn-C7; Sun, 23 Nov 2014 18:50:02 +0100 In-Reply-To: (Steinar Bang's message of "Sun, 23 Nov 2014 17:32:57 +0100") 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:178105 Archived-At: Steinar Bang writes: >>>>>> David Engster : > >> 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 don't need a clone for this, just a local bare repo. [...] I know, but you have snipped the context. The problem was: what's the most robust solution for people who want to have separate checkouts of branches, but which is also (a) easy to setup, (b) works well on Windows, and (c) is manageable for people without much git experience. And the answer for this seems to be: create two separate clones, and just live with the additional HD space this takes up. Then Eli's question was whether gitmerge.el could merge from such a separate clone, to which my answer was: I guess you could, but there's no need, let's just merge the remote branch by default. -David