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 D6E5C13888F for ; Wed, 14 Oct 2015 11:51:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC3E9E07DF; Wed, 14 Oct 2015 11:51:08 +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 2BACAE07D1 for ; Wed, 14 Oct 2015 11:51:07 +0000 (UTC) Received: by obbwb3 with SMTP id wb3so10298534obb.0 for ; Wed, 14 Oct 2015 04:51:07 -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=3XX3EV2MFagCBwURtuQiypB5cKIqLKiT7BR0zJqztwk=; b=xzeq6uS4rLKN7/ybhIuGKFcyxU2Bp9smVR05ZIeMwBrlazwKN6y1FM+BfvdbszJ+GC WqPE3lt+/PeNC1tWVg4Y9QHcl8BWbRkCsNwBiOIUXwdcCOoSNHaBh311lY9kI0ubtxw0 T22zAL/ysVIS4i5AYrDW9y7E9xRWeg1fwxkgLqorzGDDAH/vCHUc3iHGAj9n/yD2suBY BvqLSHektp7bX+RhbRx5d5c57QFUI2JIpOYKsrb0Orn/dQOzRLJVqO4/Gyf72pKUgElf N7rZZv/wHbUKHNGYEjdFEv481djNQs898AZRkESsVH5TX33lDWRibvzS+dhPYtasxlpr BPQw== X-Received: by 10.60.40.169 with SMTP id y9mr1450234oek.31.1444823467004; Wed, 14 Oct 2015 04:51:07 -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; Wed, 14 Oct 2015 04:50:27 -0700 (PDT) In-Reply-To: <561DF32B.8060406@linux.sungazer.de> References: <5618E9F5.40303@gentoo.org> <561B9252.5080401@linux.sungazer.de> <561D6C9E.5080403@linux.sungazer.de> <561DF32B.8060406@linux.sungazer.de> From: Nicolas Bock Date: Wed, 14 Oct 2015 05:50:27 -0600 X-Google-Sender-Auth: 1rm2uMU9PNNrUpWZfQTmgJqtznI 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: 04abb3d5-8659-4380-9752-8e72e08b2bd8 X-Archives-Hash: d2f9c2727e4d206045b69d1615d9654c Hi Marius, thanks for the details! I noticed that lately repoman is adding the category/package name at the beginning of the commit message. Good to know about the --echangelog=n option. Thanks again! Nick On Wed, Oct 14, 2015 at 12:16 AM, Marius Brehler wrote: > > > On 10/13/2015 10:50 PM, Nicolas Bock wrote: >> On Tue, Oct 13, 2015 at 2:42 PM, Marius Brehler >> wrote: >>> On 10/13/2015 02:08 PM, Nicolas Bock wrote: >>>> [..] >>>> 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? > > I actually don't know if there is a recommendation. I use 'repo-commit' > for short commit messages and 'repoman commit', if line breaks in the > commit message are desired. By the way, 'repoman commit --echangelog=n', > actually does the same as 'repo-commit -t'. > > Regarding re-commiting, 'repo-commit' is a little easier to handle as it > allows to pass the commit message via the shell. 'repoman commit' allows > this when passing '-m "commit message"', but does not add the > category/packagename in front of the commit message. > Thus, copying the commit message and using 'repoman commit' requires > more effort than using 'repo-commit' > Regards > > Marius