[gentoo-science] Re: ChangeLog in the overlay

[Nicolas Bock]

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
<marbre@××××××××××××××.de> wrote:
>
>
> On 10/13/2015 10:50 PM, Nicolas Bock wrote:
>> On Tue, Oct 13, 2015 at 2:42 PM, Marius Brehler
>> <marbre@××××××××××××××.de> 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 <previous commit message>' 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