From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Incorrect merge Date: Tue, 02 Nov 2010 10:16:07 +0100 Message-ID: References: <4CCEC526.3070502@cornell.edu> <87aaltc9rc.fsf@stupidchicken.com> <83pqup53qb.fsf@gnu.org> <83fwvk6arf.fsf@gnu.org> <87pquok5pi.fsf@telefonica.net> <4CCF6988.4040804@gnu.org> <87lj5cjofg.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1288706297 18034 80.91.229.12 (2 Nov 2010 13:58:17 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 2 Nov 2010 13:58:17 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 02 14:58:13 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.69) (envelope-from ) id 1PDHNL-0003Ib-0F for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 14:58:13 +0100 Original-Received: from localhost ([127.0.0.1]:49030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDHNB-00051u-IH for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 09:58:01 -0400 Original-Received: from [140.186.70.92] (port=35212 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDHAC-00044k-MS for emacs-devel@gnu.org; Tue, 02 Nov 2010 09:44:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDCyR-0004Bu-Un for emacs-devel@gnu.org; Tue, 02 Nov 2010 05:16:13 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:57509) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDCyR-0004BC-PX for emacs-devel@gnu.org; Tue, 02 Nov 2010 05:16:11 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 256AD1C15CFE; Tue, 2 Nov 2010 10:16:04 +0100 (CET) Original-Received: from hase.home (ppp-88-217-97-156.dynamic.mnet-online.de [88.217.97.156]) by mail.mnet-online.de (Postfix) with ESMTP id 95AB51C0018F; Tue, 2 Nov 2010 10:16:04 +0100 (CET) X-Yow: Yow! Maybe I should have asked for my Neutron Bomb in PAISLEY-- In-Reply-To: <87lj5cjofg.fsf@telefonica.net> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Tue, 02 Nov 2010 06:16:03 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.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:132270 Archived-At: =C3=93scar Fuentes writes: > This is equivalent to saying that a change on common-fixes could depend > on a change made to emacs-23 only. How do you keep the branch up-to-date? Andreas. --=20 Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."