From patchwork Tue Aug 7 09:46:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Yanok X-Patchwork-Id: 175557 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3BA772C0085 for ; Tue, 7 Aug 2012 19:46:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 91E01282B8; Tue, 7 Aug 2012 11:46:50 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AApK6z0QQkmj; Tue, 7 Aug 2012 11:46:50 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 30A61282B9; Tue, 7 Aug 2012 11:46:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8664528275 for ; Tue, 7 Aug 2012 11:46:19 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CYt4OgdRdvAa for ; Tue, 7 Aug 2012 11:46:18 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-lpp01m010-f44.google.com (mail-lpp01m010-f44.google.com [209.85.215.44]) by theia.denx.de (Postfix) with ESMTPS id 1FF3B28278 for ; Tue, 7 Aug 2012 11:46:16 +0200 (CEST) Received: by lahm15 with SMTP id m15so2002718lah.3 for ; Tue, 07 Aug 2012 02:46:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=NwlHE3P2tn+G5cb30AoEr2HQh7VA44dDQAIf5JApVdU=; b=CWTKdZvgUB+4Xc24YTGD8bUguXYJRjoXJ7nvSoKhEJ7iipSfh8DXStZwaGmXImArIK 8ab/50hiced1d67WKYchSPd8PUOfC47Zb4Ikkp1BBuXUA6xzjawFQoglVEZUuWvTHGXT hoGb99uGNbgT7vgI9l/b5svhH4narupv1s9yJ0ciDqLhDaGYV7ZaeReS2P2eRbVxzHfC wOvyECB2f1PqGfsFt8Ls5wL+sk8hLe8q7beuiiuE7MPXf22niHW0qnNwtzqWziSFlFrO JtQRq0fyf6x6tCamGsuVamEJD91IjHsV6wF3wQ60DUktgrU95BQ7Ee5VXYgJxn+0Xhyy CEPQ== Received: by 10.152.144.163 with SMTP id sn3mr13915620lab.37.1344332775589; Tue, 07 Aug 2012 02:46:15 -0700 (PDT) Received: from localhost.localdomain ([188.134.70.194]) by mx.google.com with ESMTPS id d3sm4250236lbh.3.2012.08.07.02.46.15 (version=SSLv3 cipher=OTHER); Tue, 07 Aug 2012 02:46:15 -0700 (PDT) From: Ilya Yanok To: u-boot@lists.denx.de Date: Tue, 7 Aug 2012 13:46:07 +0400 Message-Id: <1344332768-11891-4-git-send-email-ilya.yanok@cogentembedded.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344332768-11891-1-git-send-email-ilya.yanok@cogentembedded.com> References: <1344332768-11891-1-git-send-email-ilya.yanok@cogentembedded.com> X-Gm-Message-State: ALoCoQnjw7eBM3kA/otGHw99Bw765Q6pU38rPBenNV6X8npq2KwV7yl8IjztxOTSdZXR2TSUKYKS Cc: Ilya Yanok Subject: [U-Boot] [PATCH 3/4] patman: don't mess with changelog X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Don't try to sort and uniq changelog entries as this breaks multiline entries. It will be better to add some real multi-line support but for now just preserve the entries as is. Signed-off-by: Ilya Yanok --- tools/patman/series.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/patman/series.py b/tools/patman/series.py index 05d9e73..4e7cb71 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -154,10 +154,9 @@ class Series(dict): for this_commit, text in self.changes[change]: if commit and this_commit != commit: continue - if text not in out: - out.append(text) + out.append(text) if out: - out = ['Changes in v%d:' % change] + sorted(out) + out = ['Changes in v%d:' % change] + out if need_blank: out = [''] + out final += out