[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Next pretest, and regressions policy

From: =?utf-8?Q?=C3=93scar_Fuentes?=
Subject: Re: Next pretest, and regressions policy
Date: Sun, 01 Apr 2012 14:37:03 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux)

Bastien <address@hidden> writes:

>> I released Org 7.8.07, which I will merge into Emacs trunk
>> tomorrow morning.  
> Done.  I carefully reviewed the ChangeLogs, but if anything
> looks wrong or suspicious, please let me know.

Hello Bastien.

At a first glance, there are places where copyright notices and other
boilerplate are overwritten with older text. The most glaring case is

=== modified file 'lisp/org/ob-fortran.el'
--- a/lisp/org/ob-fortran.el    2012-01-10 06:20:22 +0000
+++ b/lisp/org/ob-fortran.el    2012-04-01 09:49:25 +0000
@@ -1,32 +1,29 @@
 ;;; ob-fortran.el --- org-babel functions for fortran
-;; Copyright (C) 2011-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2011-2012 Sergey Litvinov, Eric Schulte
-;; Authors: Sergey Litvinov
-;;         Eric Schulte
+;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte
 ;; Keywords: literate programming, reproducible research, fortran
 ;; Homepage: http://orgmode.org
-;; Version: 7.8.02
-;; This file is part of GNU Emacs.
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify

All other occurrences of "Copyright" on your commit are an indication of
a mistake.

I suggest that, before syncing, you obtain a diff from the bzr (or git)
emacs repo that contains all changes to org since your last sync, commit
the diff onto your org sources and then proceed with the new sync.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]