From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 041FB13888F for ; Tue, 13 Oct 2015 20:51:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E99E8E07D9; Tue, 13 Oct 2015 20:51:03 +0000 (UTC) Received: from mail-ob0-f169.google.com (mail-ob0-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69343E07D4 for ; Tue, 13 Oct 2015 20:51:03 +0000 (UTC) Received: by obbzf10 with SMTP id zf10so24040800obb.2 for ; Tue, 13 Oct 2015 13:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=r60R+ikiMjOfLuiHhTdbcZKeE4jDE+c/RG0Inszp0oM=; b=GJa/452MzZecE0QwkbAF4woS8c3gzvKrRD2HEYwy3IFSr5BkBdJr3YdvOw2rqsEQEZ sPcWUiujVck93OyRu+g67v7fz8lhsiJRxA0ZDeOkD6SuB1eZoXQXdaLEe4LeDid04N4x EHsmvEtmfMSMq7BuFdxBsRwbGv9uh3jLLQrWFT36h7Owbba6aZFrluFwFoZKSeVSaq/1 TfThagHKuumJqNQtcvjEYYm4Qaz1+CsTVxpT3EtbNv9SHgzCrPVi/f5+s5yvOAXOdrIs F6OqCn16O/5YiLdIBWjEzwCLMLNvylgkjhi/9lPEE6J3T1fyHQK1rIqVtwCCRxO212x2 DItQ== X-Received: by 10.182.96.100 with SMTP id dr4mr21908793obb.49.1444769462504; Tue, 13 Oct 2015 13:51:02 -0700 (PDT) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-science@lists.gentoo.org Reply-to: gentoo-science@lists.gentoo.org MIME-Version: 1.0 Sender: nicolasbock@gmail.com Received: by 10.76.175.98 with HTTP; Tue, 13 Oct 2015 13:50:23 -0700 (PDT) In-Reply-To: <561D6C9E.5080403@linux.sungazer.de> References: <5618E9F5.40303@gentoo.org> <561B9252.5080401@linux.sungazer.de> <561D6C9E.5080403@linux.sungazer.de> From: Nicolas Bock Date: Tue, 13 Oct 2015 14:50:23 -0600 X-Google-Sender-Auth: mt1AcPIpa5NMVcsjxiVpIB-hBzw Message-ID: Subject: [gentoo-science] Re: ChangeLog in the overlay To: Marius Brehler Cc: Nicolas Bock , sci@gentoo.org, Gentoo Science List Content-Type: text/plain; charset=UTF-8 X-Archives-Salt: d53b623f-0aaa-44b6-b0a6-a51e5705b62d X-Archives-Hash: a4d72f869101a3d38356b6302b4fafe6 On Tue, Oct 13, 2015 at 2:42 PM, Marius Brehler wrote: > On 10/13/2015 02:08 PM, Nicolas Bock wrote: >> On Mon, Oct 12, 2015 at 4:58 AM, Marius Brehler >> wrote: >>> >>> >>> On 10/10/2015 12:35 PM, Justin Lecher (jlec) wrote: >>>> Hi everyone, >>>> >>>> What is your opinion on dropping the ChangeLog in the overlay in >>>> favour of the git log as it has been done in the tree? >>>> >>>> Justin >>>> >>> >>> Hi, >>> I prefer to drop the ChangeLogs. Since we give a lot advices and many >>> contributes push their changes incremental without using 'repo-commit >>> -t', or re-commit changed ebuilds, ChangeLogs often blow up. For example >>> see [1], which is AFAIR not the worst one. >>> Regards >>> >> Hi Marius, >> >> out of curiosity: What does the -t option do? And how does one >> re-commit a change using repoman? >> >> Thanks, >> >> Nick > > > Hi, > the -t option prevents adding a ChangeLog entry: > > -t, --trivial trivial changes (do not add a ChangeLog entry) > > > With re-commiting, I mean one could reset without loosing the > modifications with 'git reset --soft HEAD^' (or by specifying a commit > hash/tag/e.g.), apply the new changes/caring for the annotations and > than just executing 'repo-commit ' again. > I hope that answers your question, if not please let me know. > Regards > Thanks, that explains it! I missed that you are using 'repo-commit' and not 'repoman' :) Is repo-commit recommended over repoman? > Marius