From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: "Richard M. Stallman" <rms@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: New speedbar version
Date: Mon, 03 Oct 2005 11:35:05 -0400
Message-ID: <E1EMSLJ-00017S-Hz@fencepost.gnu.org>
References: <200510010013.j910D3Iv008194@all-night-tool.mit.edu>
	<877jcwj7st.fsf-monnier+emacs@gnu.org>
	<fc339e4a051002200761a6202c@mail.gmail.com>
Reply-To: rms@gnu.org
NNTP-Posting-Host: main.gmane.org
Content-Type: text/plain; charset=ISO-8859-15
X-Trace: sea.gmane.org 1128354464 1834 80.91.229.2 (3 Oct 2005 15:47:44 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Mon, 3 Oct 2005 15:47:44 +0000 (UTC)
Cc: cyd@stupidchicken.com, nickrob@snap.net.nz, monnier@iro.umontreal.ca,
	emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Oct 03 17:47:33 2005
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Original-Received: from lists.gnu.org ([199.232.76.165])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1EMST4-0007fT-Ma
	for ged-emacs-devel@m.gmane.org; Mon, 03 Oct 2005 17:43:07 +0200
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1EMST4-0007lW-9H
	for ged-emacs-devel@m.gmane.org; Mon, 03 Oct 2005 11:43:06 -0400
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EMSQn-0006zq-I5
	for emacs-devel@gnu.org; Mon, 03 Oct 2005 11:40:47 -0400
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EMSQk-0006yg-Q2
	for emacs-devel@gnu.org; Mon, 03 Oct 2005 11:40:43 -0400
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EMSQk-0006qm-BK
	for emacs-devel@gnu.org; Mon, 03 Oct 2005 11:40:42 -0400
Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EMSLK-0002n9-O0
	for emacs-devel@gnu.org; Mon, 03 Oct 2005 11:35:06 -0400
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.34)
	id 1EMSLJ-00017S-Hz; Mon, 03 Oct 2005 11:35:05 -0400
Original-To: snogglethorpe@gmail.com, miles@gnu.org
In-reply-to: <fc339e4a051002200761a6202c@mail.gmail.com> (message from Miles
	Bader on Mon, 3 Oct 2005 12:07:38 +0900)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:43499
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/43499>

    Anyway, as a general rule:  _never_ just "check in" new versions of
    upstream files.  _Always_ merge them.

Yes, that's right.