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: NEVER use `bzr push' for sending changes upstream (was: merge conlict?) Date: Mon, 25 Jan 2010 14:54:48 +0100 Message-ID: <87eile1e8n.fsf_-_@telefonica.net> References: <83vdeq634g.fsf@gnu.org> <83tyua5y8r.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264428734 23957 80.91.229.12 (25 Jan 2010 14:12:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 14:12:14 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 15:12:06 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 1NZPeE-0006XU-OX for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 15:10:34 +0100 Original-Received: from localhost ([127.0.0.1]:37018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZPSN-0003lj-0R for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 08:58:19 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZPQn-0001qj-EG for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:56:41 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZPQg-0001h8-08 for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:56:38 -0500 Original-Received: from [199.232.76.173] (port=42565 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZPQe-0001gS-RZ for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:56:32 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:62900) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZPQb-0001kG-HG for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:56:30 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZPPQ-0001Fl-1m for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:55:16 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZPPM-0007ss-Ok for emacs-devel@gnu.org; Mon, 25 Jan 2010 14:55:12 +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 ; Mon, 25 Jan 2010 14:55:12 +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 ; Mon, 25 Jan 2010 14:55:12 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 12 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:6kA5wIgNbTPVbzrXjvjDxbRJDYg= X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:120368 Archived-At: Eli Zaretskii writes: [snip] > (Btw, mhershberger@intrahealth.org bounces.) Mark did "merge & push" twice, so it is very likely that that is his usual workflow. It is *very* damaging for the VC history. If Mark can't be contacted for telling him to correct his bzr workflow, his commit rights should be removed. Hopefully he will come here to ask why he can't commit and then we will explain the problem to him.