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: NEVER use `bzr push' for sending changes upstream Date: Mon, 25 Jan 2010 19:28:40 +0100 Message-ID: <87636qyr6v.fsf@telefonica.net> References: <83vdeq634g.fsf@gnu.org> <83tyua5y8r.fsf@gnu.org> <87eile1e8n.fsf_-_@telefonica.net> <87wrz6xfd5.fsf@everybody.org> 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 1264444232 32289 80.91.229.12 (25 Jan 2010 18:30:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 18:30:32 +0000 (UTC) Cc: mah@everybody.org To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 19:30:24 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 1NZThf-00018w-D6 for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 19:30:23 +0100 Original-Received: from localhost ([127.0.0.1]:51802 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZThg-0000XW-GA for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 13:30:24 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZTha-0000VR-ML for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:30:18 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZThW-0000Ov-2Q for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:30:18 -0500 Original-Received: from [199.232.76.173] (port=45827 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZThV-0000Oi-VQ for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:30:13 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:53159) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZThV-0002Po-Kf for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:30:13 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZThN-00012l-PU for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:30:05 +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 19:30:05 +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 19:30:05 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 23 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:Uq6JiPfFyU7eWzQDlMY21U9yHnw= 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:120384 Archived-At: mah@everybody.org (Mark A. Hershberger) writes: > Óscar Fuentes writes: > >>> (Btw, mhershberger@intrahealth.org bounces.) > > I'll fix that. “bzr whoami” to the rescue. > > >> Mark did "merge & push" twice, so it is very likely that that is his >> usual workflow. It is *very* damaging for the VC history. > > Appologies. I'll make any changes suggested in this thread. I didn't > intend to commit twice. I got confused by the second conflict. Hello Mark. If there is a reason for not following the worflow described in http://www.emacswiki.org/emacs/BzrForEmacsDevs or if you misunderstood something, please describe what's wrong for you and we'll try to fix it.