From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: splitting ChangeLogs
Date: Wed, 06 Apr 2011 05:14:00 -0400
Message-ID: <E1Q7OoK-0002MJ-0Z@fencepost.gnu.org>
References: <BANLkTi=sDC4inr4hS_kksPZPjqJUzhfy=w@mail.gmail.com>
	<83k4f8uls8.fsf@gnu.org> <dod3l0auzz.fsf@fencepost.gnu.org>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: dough.gmane.org 1302081295 4585 80.91.229.12 (6 Apr 2011 09:14:55 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Wed, 6 Apr 2011 09:14:55 +0000 (UTC)
Cc: lekktu@gmail.com, emacs-devel@gnu.org
To: Glenn Morris <rgm@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 06 11:14:51 2011
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1Q7Op8-0005Hj-AW
	for ged-emacs-devel@m.gmane.org; Wed, 06 Apr 2011 11:14:50 +0200
Original-Received: from localhost ([127.0.0.1]:51990 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1Q7Op7-000889-2j
	for ged-emacs-devel@m.gmane.org; Wed, 06 Apr 2011 05:14:49 -0400
Original-Received: from [140.186.70.92] (port=45409 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q7OoM-0007cU-73
	for emacs-devel@gnu.org; Wed, 06 Apr 2011 05:14:03 -0400
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1Q7OoK-00010Q-5o
	for emacs-devel@gnu.org; Wed, 06 Apr 2011 05:14:00 -0400
Original-Received: from fencepost.gnu.org ([140.186.70.10]:51153)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1Q7OoK-00010L-4C
	for emacs-devel@gnu.org; Wed, 06 Apr 2011 05:14:00 -0400
Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.71)
	(envelope-from <eliz@gnu.org>)
	id 1Q7OoK-0002MJ-0Z; Wed, 06 Apr 2011 05:14:00 -0400
In-reply-to: <dod3l0auzz.fsf@fencepost.gnu.org> (message from Glenn Morris on
	Wed, 06 Apr 2011 00:01:20 -0400)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 140.186.70.10
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/archive/html/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:138219
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/138219>

> From: Glenn Morris <rgm@gnu.org>
> Cc: Juanma Barranquero <lekktu@gmail.com>,  emacs-devel@gnu.org
> Date: Wed, 06 Apr 2011 00:01:20 -0400
> 
> >>   bzr mv ChangeLog ChangeLog.11
> >>   copy ChangeLog.11 ChangeLog
> >>   ;; edit and trim both files
> >>   bzr add ChangeLog
> >>   bzr commit -m "..."
> >
> > The latter, I think.
> 
> Shouldn't ChangeLog should keep its current file-id, so that eg merged
> entries from emacs-23 go to the correct file?

I thought the ChangeLog entries from the emacs-23 branch are merged
manually.  If they are merged automatically, then you are right.