From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: New speedbar version Date: Mon, 3 Oct 2005 12:07:38 +0900 Message-ID: References: <200510010013.j910D3Iv008194@all-night-tool.mit.edu> <877jcwj7st.fsf-monnier+emacs@gnu.org> Reply-To: snogglethorpe@gmail.com, miles@gnu.org NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: sea.gmane.org 1128309004 12419 80.91.229.2 (3 Oct 2005 03:10:04 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 3 Oct 2005 03:10:04 +0000 (UTC) Cc: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Oct 03 05:10:01 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EMGh7-0006GI-Ea for ged-emacs-devel@m.gmane.org; Mon, 03 Oct 2005 05:08:49 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EMGh6-0007Og-Hm for ged-emacs-devel@m.gmane.org; Sun, 02 Oct 2005 23:08:48 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EMGgd-0007Ia-Bs for emacs-devel@gnu.org; Sun, 02 Oct 2005 23:08:19 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EMGga-0007H1-Ep for emacs-devel@gnu.org; Sun, 02 Oct 2005 23:08:18 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EMGgZ-0007GQ-QG for emacs-devel@gnu.org; Sun, 02 Oct 2005 23:08:15 -0400 Original-Received: from [64.233.184.206] (helo=wproxy.gmail.com) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EMGfz-0007t0-VD for emacs-devel@gnu.org; Sun, 02 Oct 2005 23:07:40 -0400 Original-Received: by wproxy.gmail.com with SMTP id i6so116197wra for ; Sun, 02 Oct 2005 20:07:39 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=YeFBwPNPFGTzHhGTPxFUaqV7ZgTWjMeeqZ0IvQIJrtQ+gx2/E6LJvBfkkKRmykZ3B43tTWqHDYLvBQSz1Utg6LWKsKlI4CnmdatN/Fcl3W0eYka0EkRKi3uNcdT9B01oDakm7GRwfL5+Jjwwi/4mhDB0aXH6RPDzhyZ4gu//3Lc= Original-Received: by 10.54.128.9 with SMTP id a9mr656289wrd; Sun, 02 Oct 2005 20:07:38 -0700 (PDT) Original-Received: by 10.54.160.6 with HTTP; Sun, 2 Oct 2005 20:07:38 -0700 (PDT) Original-To: Chong Yidong , Nick Roberts , emacs-devel@gnu.org In-Reply-To: <877jcwj7st.fsf-monnier+emacs@gnu.org> Content-Disposition: inline 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:43478 Archived-At: 2005/10/2, Stefan Monnier : > > Unfortunately, checking in the new version of Speedbar (which has been > > undergoing development in its own tree for two years) was itself one > > of the items needed for the release. See, for example, > > > http://lists.gnu.org/archive/html/emacs-devel/2005-05/msg00202.html > > BTW, could whoever worked on this speedbar.el thingy install on a branch = the > "original" upstream version, so that in the future we will be able to > trivially extract the local changes we've made (or, equivalently, to easi= ly > install a newer upstream release o n that branch and then ask CVS to do > (most of) the merge for us)? Anyway, as a general rule: _never_ just "check in" new versions of upstream files. _Always_ merge them. If that seems annoying then the first step is to track down the history you need to do such a merge (and hopefully, as Stefan suggests, do some preparation so that the next merge is easier). -Miles -- Do not taunt Happy Fun Ball.