Gentoo Archives: gentoo-science

From: Nicolas Bock <nicolasbock@g.o>
To: Marius Brehler <marbre@××××××××××××××.de>
Cc: Nicolas Bock <nicolasbock@g.o>, sci@g.o, Gentoo Science List <gentoo-science@l.g.o>
Subject: [gentoo-science] Re: ChangeLog in the overlay
Date: Tue, 13 Oct 2015 20:51:09
Message-Id: CAPMKG4Dzcvs7YsTH9muaJO-13jA8xTFD+tSrwvYnEeSBqdfRkg@mail.gmail.com
1 On Tue, Oct 13, 2015 at 2:42 PM, Marius Brehler
2 <marbre@××××××××××××××.de> wrote:
3 > On 10/13/2015 02:08 PM, Nicolas Bock wrote:
4 >> On Mon, Oct 12, 2015 at 4:58 AM, Marius Brehler
5 >> <marbre@××××××××××××××.de> wrote:
6 >>>
7 >>>
8 >>> On 10/10/2015 12:35 PM, Justin Lecher (jlec) wrote:
9 >>>> Hi everyone,
10 >>>>
11 >>>> What is your opinion on dropping the ChangeLog in the overlay in
12 >>>> favour of the git log as it has been done in the tree?
13 >>>>
14 >>>> Justin
15 >>>>
16 >>>
17 >>> Hi,
18 >>> I prefer to drop the ChangeLogs. Since we give a lot advices and many
19 >>> contributes push their changes incremental without using 'repo-commit
20 >>> -t', or re-commit changed ebuilds, ChangeLogs often blow up. For example
21 >>> see [1], which is AFAIR not the worst one.
22 >>> Regards
23 >>>
24 >> Hi Marius,
25 >>
26 >> out of curiosity: What does the -t option do? And how does one
27 >> re-commit a change using repoman?
28 >>
29 >> Thanks,
30 >>
31 >> Nick
32 >
33 >
34 > Hi,
35 > the -t option prevents adding a ChangeLog entry:
36 >
37 > -t, --trivial trivial changes (do not add a ChangeLog entry)
38 >
39 >
40 > With re-commiting, I mean one could reset without loosing the
41 > modifications with 'git reset --soft HEAD^' (or by specifying a commit
42 > hash/tag/e.g.), apply the new changes/caring for the annotations and
43 > than just executing 'repo-commit <previous commit message>' again.
44 > I hope that answers your question, if not please let me know.
45 > Regards
46 >
47 Thanks, that explains it! I missed that you are using 'repo-commit'
48 and not 'repoman' :) Is repo-commit recommended over repoman?
49
50 > Marius