unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Re: trunk r112949: Merge: Doc fix for VC.
       [not found] <E1Umjym-0002d0-Ts@vcs.savannah.gnu.org>
@ 2013-06-12 15:52 ` Glenn Morris
  2013-06-12 22:25   ` Xue Fuqiao
  0 siblings, 1 reply; 6+ messages in thread
From: Glenn Morris @ 2013-06-12 15:52 UTC (permalink / raw)
  To: Xue Fuqiao; +Cc: emacs-devel

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  <xfq.free@gmail.com>
> +
> +	* 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.



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: trunk r112949: Merge: Doc fix for VC.
  2013-06-12 15:52 ` trunk r112949: Merge: Doc fix for VC Glenn Morris
@ 2013-06-12 22:25   ` Xue Fuqiao
  2013-06-13  5:29     ` Glenn Morris
  0 siblings, 1 reply; 6+ messages in thread
From: Xue Fuqiao @ 2013-06-12 22:25 UTC (permalink / raw)
  To: Glenn Morris; +Cc: emacs-devel

On Wed, Jun 12, 2013 at 11:52 PM, Glenn Morris <rgm@gnu.org> wrote:
> 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  <xfq.free@gmail.com>
>> +
>> +     * 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.

I see.  Do I need to fix the previous ChangeLog entries?

--
Best regards, Xue Fuqiao.
http://www.gnu.org/software/emacs/



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: trunk r112949: Merge: Doc fix for VC.
  2013-06-12 22:25   ` Xue Fuqiao
@ 2013-06-13  5:29     ` Glenn Morris
  2013-06-13 22:34       ` Xue Fuqiao
  0 siblings, 1 reply; 6+ messages in thread
From: Glenn Morris @ 2013-06-13  5:29 UTC (permalink / raw)
  To: Xue Fuqiao; +Cc: emacs-devel

Xue Fuqiao wrote:

>> 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.

(BTW, there's also admin/bzrmerge.el.)

> I see.  Do I need to fix the previous ChangeLog entries?

Yes please.



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: trunk r112949: Merge: Doc fix for VC.
  2013-06-13  5:29     ` Glenn Morris
@ 2013-06-13 22:34       ` Xue Fuqiao
  2013-06-13 22:38         ` Glenn Morris
  0 siblings, 1 reply; 6+ messages in thread
From: Xue Fuqiao @ 2013-06-13 22:34 UTC (permalink / raw)
  To: Glenn Morris; +Cc: emacs-devel

On Thu, Jun 13, 2013 at 1:29 PM, Glenn Morris <rgm@gnu.org> wrote:
> Xue Fuqiao wrote:
>
>>> 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.
>
> (BTW, there's also admin/bzrmerge.el.)
>
>> I see.  Do I need to fix the previous ChangeLog entries?
>
> Yes please.

Done as r112977.

--
Best regards, Xue Fuqiao.
http://www.gnu.org/software/emacs/



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: trunk r112949: Merge: Doc fix for VC.
  2013-06-13 22:34       ` Xue Fuqiao
@ 2013-06-13 22:38         ` Glenn Morris
  2013-06-13 22:44           ` Xue Fuqiao
  0 siblings, 1 reply; 6+ messages in thread
From: Glenn Morris @ 2013-06-13 22:38 UTC (permalink / raw)
  To: Xue Fuqiao; +Cc: emacs-devel

Xue Fuqiao wrote:

>>>> 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.
>>
>> (BTW, there's also admin/bzrmerge.el.)
>>
>>> I see.  Do I need to fix the previous ChangeLog entries?
>>
>> Yes please.
>
> Done as r112977.

Thatnks, but you still need to fix the date to be the (UTC) date that
you committed to Emacs.



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: trunk r112949: Merge: Doc fix for VC.
  2013-06-13 22:38         ` Glenn Morris
@ 2013-06-13 22:44           ` Xue Fuqiao
  0 siblings, 0 replies; 6+ messages in thread
From: Xue Fuqiao @ 2013-06-13 22:44 UTC (permalink / raw)
  To: Glenn Morris; +Cc: emacs-devel

On Fri, Jun 14, 2013 at 6:38 AM, Glenn Morris <rgm@gnu.org> wrote:
> Xue Fuqiao wrote:
>
>>>>> 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.
>>>> I see.  Do I need to fix the previous ChangeLog entries?
>>>
>>> Yes please.
>>
>> Done as r112977.
>
> Thatnks, but you still need to fix the date to be the (UTC) date that
> you committed to Emacs.

I'm sorry for my carelessness.  That should be fixed now.

--
Best regards, Xue Fuqiao.
http://www.gnu.org/software/emacs/



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-06-13 22:44 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <E1Umjym-0002d0-Ts@vcs.savannah.gnu.org>
2013-06-12 15:52 ` trunk r112949: Merge: Doc fix for VC Glenn Morris
2013-06-12 22:25   ` Xue Fuqiao
2013-06-13  5:29     ` Glenn Morris
2013-06-13 22:34       ` Xue Fuqiao
2013-06-13 22:38         ` Glenn Morris
2013-06-13 22:44           ` Xue Fuqiao

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).