From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: trunk r112949: Merge: Doc fix for VC. Date: Wed, 12 Jun 2013 11:52:58 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1371052387 24083 80.91.229.3 (12 Jun 2013 15:53:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 12 Jun 2013 15:53:07 +0000 (UTC) Cc: emacs-devel@gnu.org To: Xue Fuqiao Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jun 12 17:53:06 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UmnM8-0005As-Nl for ged-emacs-devel@m.gmane.org; Wed, 12 Jun 2013 17:53:04 +0200 Original-Received: from localhost ([::1]:58405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmnM8-0003FP-Bm for ged-emacs-devel@m.gmane.org; Wed, 12 Jun 2013 11:53:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmnM4-0003F3-C1 for emacs-devel@gnu.org; Wed, 12 Jun 2013 11:53:02 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UmnM3-0002Uy-AV for emacs-devel@gnu.org; Wed, 12 Jun 2013 11:53:00 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40661) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmnM3-0002Ur-7n for emacs-devel@gnu.org; Wed, 12 Jun 2013 11:52:59 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1UmnM2-0007Xy-Gv; Wed, 12 Jun 2013 11:52:58 -0400 X-Spook: Vince Foster Ft. Knox assassination unclassified X-Ran: zb+v[/>iO-#1ZDv1K'Pogc"\'"j}bU(LX*Q6w?GKeW_vw{2S{sWf#J$wB:&D]}h[03X7"% X-Hue: green X-Attribution: GM In-Reply-To: (Xue Fuqiao's message of "Wed, 12 Jun 2013 12:16:45 +0000") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:160378 Archived-At: Xue Fuqiao wrote: > --- a/doc/emacs/ChangeLog 2013-06-11 06:42:15 +0000 > +++ b/doc/emacs/ChangeLog 2013-06-12 12:12:47 +0000 > @@ -3,6 +3,11 @@ > * maintaining.texi (VC Directory Commands): Copyedit. > (Branches): Put back milder version of pre 2013-06-07 text. > > +2013-06-09 Xue Fuqiao > + > + * vc1-xtra.texi (Revision Tags): Add a cross reference. > + (CVS Options): Fix the default value of `vc-cvs-stay-local'. > + Please put ChangeLog entries at the top of the file (bzr's changelog_merge plugin can help with this), with the date the date that you commit the change to Emacs. Thanks.