From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Reiner Steib <4.uce.03.r.s@nurfuerspam.de> Newsgroups: gmane.emacs.devel Subject: ChangeLog when merging from "upstream" Date: Thu, 05 Aug 2004 23:12:24 +0200 Organization: Dept. of Theoretical Physics, University of Ulm Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: Reply-To: Reiner Steib NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1091740527 23813 80.91.224.253 (5 Aug 2004 21:15:27 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 5 Aug 2004 21:15:27 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 05 23:15:18 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1Bspa2-000673-00 for ; Thu, 05 Aug 2004 23:15:18 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1Bspdb-0003CW-CP for ged-emacs-devel@m.gmane.org; Thu, 05 Aug 2004 17:18:59 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1BspdQ-0003BV-PY for emacs-devel@gnu.org; Thu, 05 Aug 2004 17:18:48 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1BspdQ-0003BC-2D for emacs-devel@gnu.org; Thu, 05 Aug 2004 17:18:48 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BspdP-0003Ao-W6 for emacs-devel@gnu.org; Thu, 05 Aug 2004 17:18:48 -0400 Original-Received: from [80.91.224.249] (helo=main.gmane.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1BspYm-00028X-7s for emacs-devel@gnu.org; Thu, 05 Aug 2004 17:14:00 -0400 Original-Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1BspYl-00075D-00 for ; Thu, 05 Aug 2004 23:13:59 +0200 Original-Received: from lumberjack.physik.uni-ulm.de ([134.60.10.173]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 05 Aug 2004 23:13:58 +0200 Original-Received: from reiner.steib by lumberjack.physik.uni-ulm.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 05 Aug 2004 23:13:58 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-To: emacs-devel@gnu.org Original-Lines: 43 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: lumberjack.physik.uni-ulm.de X-Face: #vK]N[`vqjuod*|)'[iD7/"3AB-ApT%fmN"LWAg@oS7OesGv~)n[OBTLM#I="J'Y^-7I I/ps7o_'IK@#-Rs{::DZ@O8yS|fexe,XslY[:dNWOb~>?mC-&i_c)say:"\IpA.5U.b]'NY; Pks{lb h.+#6%DpZuaK3dcHB`Av3zc:r!C%~s0&m, tWj]&}, qg.+0ww2gK%f!:GK|wMl.I!(voY*1"^li8"~B BNG)9LvPi?^DMR-GVDnZqhu*3Hi, +g=wFhI)BL6&u{EOVEHjVEVq~d?_}lMntWAc3(6?kftjc>_f>! g0wM(qPM$d5]^TT_Qyi&L?LGVG)SHN;Gk/,pkY9,~ Mail-Copies-To: nobody User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3.50 (gnu/linux) Cancel-Lock: sha1:NsjGuZ1U9ssjGaGpMO2dPH4BsD4= 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: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:26200 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:26200 Hi, I want to merge a change from Gnus' repository (committed after emacs21_4-gnus-5_10-branchpoint) into Emacs (gnus-5_10-branch). The change in Gnus is dated 2004-08-02. When I install the changes on 2004-08-06, should it read as follows? ,---- | 2004-08-06 Reiner Steib | | Sync with v5_10 branch: | | 2004-08-02 Reiner Steib | | * gnus.el (gnus-group, gnus-summary, gnus-summary-sort): Fix | custom-manual entries. | [...] `---- I've seen similar non-monotonic date entries for tramp: ,---- | 2004-07-17 Kai Grossjohann | | Sync with Tramp 2.0.43. | | * net/tramp.el [...] | | 2004-07-13 Michael Albinus | | * net/tramp.el [...] | | 2004-07-17 Jonathan Yavner | | * emacs-lisp/testcover.el: [...] `---- Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- PGP key available via WWW http://rsteib.home.pages.de/