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 11:06:57 +0100 Message-ID: <87sk9tw56m.fsf@telefonica.net> References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87ljfleita.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264500524 778 80.91.229.12 (26 Jan 2010 10:08:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 10:08:44 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 11:08: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 1NZiLa-0000mU-CK for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 11:08:34 +0100 Original-Received: from localhost ([127.0.0.1]:53894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZiLb-0004FU-Bw for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 05:08:35 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZiKb-0003qy-9s for emacs-devel@gnu.org; Tue, 26 Jan 2010 05:07:33 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZiKV-0003ly-FJ for emacs-devel@gnu.org; Tue, 26 Jan 2010 05:07:31 -0500 Original-Received: from [199.232.76.173] (port=42577 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZiKU-0003le-Vh for emacs-devel@gnu.org; Tue, 26 Jan 2010 05:07:27 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:56123) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZiKU-0004OZ-AJ for emacs-devel@gnu.org; Tue, 26 Jan 2010 05:07:26 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZiKN-0000KC-Op for emacs-devel@gnu.org; Tue, 26 Jan 2010 11:07:19 +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 11:07:19 +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 11:07:19 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 14 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:63gDycGodHFIH8MZgWvPJGGP3gQ= 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:120426 Archived-At: "Stephen J. Turnbull" writes: > Richard Stallman writes: > > If my guess is right, Mark merged trunk into his private branch, and > > then pushed to upstream, which is very wrong. > > > > If we think this is wrong practice, can we customize something so that > > it isn't allowed? > > No. Merging [snip] The problem is `merge && push', not `merge && commit'. Stefan already asked about this on the bzr ml and it seems that there is a method for disabling just that.