From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Tue, 26 Jan 2010 00:19:01 +0100 Message-ID: <87aaw1ydqy.fsf@telefonica.net> References: <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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1264461585 5317 80.91.229.12 (25 Jan 2010 23:19:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 23:19:45 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 00:19:37 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 1NZYDY-0005O0-DY for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 00:19:36 +0100 Original-Received: from localhost ([127.0.0.1]:33891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZYDZ-0002qx-IN for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 18:19:37 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZYDS-0002qq-Ky for emacs-devel@gnu.org; Mon, 25 Jan 2010 18:19:30 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZYDO-0002pv-OE for emacs-devel@gnu.org; Mon, 25 Jan 2010 18:19:30 -0500 Original-Received: from [199.232.76.173] (port=47974 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZYDO-0002pl-Ku for emacs-devel@gnu.org; Mon, 25 Jan 2010 18:19:26 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:56227) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZYDO-000418-4L for emacs-devel@gnu.org; Mon, 25 Jan 2010 18:19:26 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZYDK-0005Ig-7q for emacs-devel@gnu.org; Tue, 26 Jan 2010 00:19:22 +0100 Original-Received: from 92.red-88-24-231.staticip.rima-tde.net ([88.24.231.92]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 26 Jan 2010 00:19:22 +0100 Original-Received: from ofv by 92.red-88-24-231.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 26 Jan 2010 00:19:22 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 36 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 92.red-88-24-231.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:bgiSw7uIM7FgMEgq8hsLPVA84y8= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:120400 Archived-At: Andreas Schwab writes: > Óscar Fuentes writes: > >> And wouldn't you happy enough knowing the commit that merged the 3 >> commits into trunk? > > How do I know without looking into it? You can look into them. `bisect' tells you the merge commit. Then either you read the merged revisions or, if you really enjoy bisecting, reconstruct its original branch and bisect it. >> It is very likely that if strict commit requirements are imposed on >> private branches, people will refrain from doing local commits at >> all. > > It will only require them to polish before pushing. First, please let's bar the word "push" and its derivatives from Bazaar discussions. Second, what you propose is quite a bit of work, and not of the trivial kind. >> Speaking as a newbie Emacs hacker, it is very encouraging to have the >> possibility of working on some feature without worrying about breaking >> things until the final point where the change is considered ready for >> trunk. OTOH, having to keep every local commit up to trunk standards >> looks very stressing. Not mentioning that most non-trivial new features >> necessarily start on an unstable state. > > For some unknown reason this appears to work very well with a big > insignificant project. Sorry, I'm not sure what you are referring to here.