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: Incorrect merge Date: Tue, 02 Nov 2010 15:17:08 +0100 Message-ID: <87hbfzkdy3.fsf@telefonica.net> 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: 8bit X-Trace: dough.gmane.org 1288713108 20896 80.91.229.12 (2 Nov 2010 15:51:48 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 2 Nov 2010 15:51:48 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 02 16:51:34 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 1PDJ94-0000ZB-8e for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 16:51:34 +0100 Original-Received: from localhost ([127.0.0.1]:38835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDJ93-0001HB-Nj for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 11:51:33 -0400 Original-Received: from [140.186.70.92] (port=33654 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDHg7-0003ZM-7o for emacs-devel@gnu.org; Tue, 02 Nov 2010 10:17:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDHfw-0002s3-T7 for emacs-devel@gnu.org; Tue, 02 Nov 2010 10:17:25 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:59008) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDHfw-0002rf-Nh for emacs-devel@gnu.org; Tue, 02 Nov 2010 10:17:24 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1PDHfr-0007ZA-0c for emacs-devel@gnu.org; Tue, 02 Nov 2010 15:17:19 +0100 Original-Received: from 83.42.13.98 ([83.42.13.98]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 02 Nov 2010 15:17:19 +0100 Original-Received: from ofv by 83.42.13.98 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 02 Nov 2010 15:17:19 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 14 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.42.13.98 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:MYOfVEmN1SpzPvoN+dCK446As44= X-detected-operating-system: by eggs.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:132274 Archived-At: Andreas Schwab writes: > Óscar 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? AFAIK almost all changes to emacs-23 are eventually merged into trunk. This means that common-fixes would containt all changes intended to emacs-23, except those few which are not intended for trunk. This means that the divergence of emacs-23 from common-fixes will not be significant.