From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Reitter Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 17:10:36 -0500 Message-ID: References: <87636q2x2q.fsf@telefonica.net> <87my021ham.fsf@telefonica.net> <87iqaq1f09.fsf@telefonica.net> <877hr61c68.fsf@telefonica.net> <87iqaqyy6s.fsf@telefonica.net> <87eileys7h.fsf@telefonica.net> <87aaw2yrec.fsf@telefonica.net> <87r5pexbm6.fsf@telefonica.net> <87my02xa5l.fsf@telefonica.net> <87iqaqx81j.fsf@telefonica.net> <87eildyj1q.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=ISO-8859-1; format=flowed; delsp=yes Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1264457460 24775 80.91.229.12 (25 Jan 2010 22:11:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 22:11:00 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?ISO-8859-1?Q?=D3scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 23:10:51 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NZX8z-00060n-SB for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 23:10:50 +0100 Original-Received: from localhost ([127.0.0.1]:35863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZX90-0008Qw-O5 for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 17:10:50 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZX8v-0008Qq-NU for emacs-devel@gnu.org; Mon, 25 Jan 2010 17:10:45 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZX8u-0008Oh-1B for emacs-devel@gnu.org; Mon, 25 Jan 2010 17:10:45 -0500 Original-Received: from [199.232.76.173] (port=45702 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZX8t-0008OX-St for emacs-devel@gnu.org; Mon, 25 Jan 2010 17:10:43 -0500 Original-Received: from qw-out-1920.google.com ([74.125.92.147]:1470) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZX8s-0003gP-JZ for emacs-devel@gnu.org; Mon, 25 Jan 2010 17:10:42 -0500 Original-Received: by qw-out-1920.google.com with SMTP id 5so73776qwc.24 for ; Mon, 25 Jan 2010 14:10:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:cc:message-id:from:to :in-reply-to:content-type:content-transfer-encoding:mime-version :subject:date:references:x-mailer; bh=5yJn4oeF6x96y56lUdpHJyhlesjXTBhJqsPDwSAKt74=; b=X+rQqp5ypIXuZtyBGoGM2A8fhntWrpn5+cIUaFkT83poX7UYnAQ6dr+z58RjLYWw4O bdo4KAHjloU3AStDhzB7ZCzu98j82aIkkpjfBsGi0u5kQ4LLksNtd62pfu3RafXGoAYd c1s4yZjZ677PSvTdVvZK8yVgotVhaM1zrqKv8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=cc:message-id:from:to:in-reply-to:content-type :content-transfer-encoding:mime-version:subject:date:references :x-mailer; b=uapeW6KYSJA7BMxAQJaaUg4mcT8DFXOOLJfnj5f3hKSK2BpvBxQ1/EWMUUGeRQykl/ qxp7RYcxjPwtmKcSI5DYTgZIWdMfYiCCo6Ll7emneZtKONflNh4iNHlNJpo1Y+PAmdy0 sLVsmKcjKnoOqbrUlGQfCdSZlgssSoJk+zOME= Original-Received: by 10.224.140.132 with SMTP id i4mr1221151qau.375.1264457440824; Mon, 25 Jan 2010 14:10:40 -0800 (PST) Original-Received: from lucy.local (pool-96-236-181-152.pitbpa.east.verizon.net [96.236.181.152]) by mx.google.com with ESMTPS id 8sm592764qwj.13.2010.01.25.14.10.38 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 25 Jan 2010 14:10:39 -0800 (PST) In-Reply-To: <87eildyj1q.fsf@telefonica.net> X-Mailer: Apple Mail (2.936) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:120397 Archived-At: On Jan 25, 2010, at 4:24 PM, =D3scar Fuentes wrote: > It is very likely that if strict commit requirements are imposed on > private branches, people will refrain from doing local commits at > all. If you have to think hard and review and test before doing a =20 > local > commit, you will delay it as much as possible, or completely avoid > it. You're both right. One of the contributors who is working with me on =20= Aquamacs and I have been discussing this last night. Even though =20 we're using Git, it should still be relevant. To avoid uninformative merge commits on the trunk (master), I =20 suggested to use "git rebase" in lieu of "git merge" whenever a =20 private (unpublished) branch is merged into the trunk. Otherwise, the =20= merge commit comment refers to branches that are not visible as named =20= branches or tags to others, even though their content and history is =20 (and I guess it'll be the same in bzr). Rebasing in that case is =20 easy, and cleaner. (It's got nothing to do with rebase "surgery" on =20 published branches, i.e., undoing history). The non-linear commit =20 history that you're discussing is another reason that I wasn't even =20 thinking about. http://wiki.bazaar.canonical.com/Rebase Would this be useful? If the commits on the private branch aren't clean, then rebasing =20 clearly won't help. Doing a merge with a reasonable commit message =20 (listing all changes, but not any possible "back and forth", =20 "trial&error" changes, sounds much better. Does bzr generally make the merged history available? Or would the =20 branch need to be pushed? (Git pushes all reachable revisions, I think, which is why I'm =20 assuming bzr does the same, but maybe I'm wrong.)=