Re: [setup] Makefile.am patches

2015-02-18 Thread Eric Blake
On 02/18/2015 08:44 AM, Corinna Vinschen wrote: I inspected your code and played around with git-tag and git-describe so it's ok. While tagging for the next release, I noticed this: $ git describe release_2.869-14-g10cac83 $ git describe --match release_\* --abbrev=6 HEAD

Re: [setup] Makefile.am patches

2015-02-18 Thread Corinna Vinschen
On Feb 18 08:55, Eric Blake wrote: On 02/18/2015 08:44 AM, Corinna Vinschen wrote: I inspected your code and played around with git-tag and git-describe so it's ok. While tagging for the next release, I noticed this: $ git describe release_2.869-14-g10cac83 $ git

Re: [setup] Makefile.am patches

2015-02-18 Thread Corinna Vinschen
On Feb 16 11:31, Corinna Vinschen wrote: On Feb 16 10:52, Achim Gratz wrote: Corinna Vinschen writes: I saw some .gitattributes file mentioning exactly this ChangeLog merging in the binutils-gdb repo and copied it over so it's part of our repo as well. That deals with the problem

Re: [setup] Makefile.am patches

2015-02-17 Thread Corinna Vinschen
On Feb 16 23:10, Achim Gratz wrote: Corinna Vinschen writes: The question is, can this be automated so that a commit automatically adds the entry to the ChangeLog file and commit the ChangeLog file at the same time? Or is there some problem with that approach? That way lies madness,

Re: [setup] Makefile.am patches

2015-02-16 Thread Achim Gratz
Corinna Vinschen writes: On Feb 16 16:03, Achim Gratz wrote: Corinna Vinschen writes: I'm more interested in seeing if you can push and how the log message on cygwin-apss-cvs looks like since I made some script changes... Pushed. Thanks. The commit message on cygwin-apps-cvs looks

Re: [setup] Makefile.am patches

2015-02-16 Thread Achim Gratz
Corinna Vinschen writes: Sounds good to me. However, I don't understand it. I expected that it writens the changelog entry automatically to the ChangeLog file, but it doesn't. I just tested it in a local branch. I added this: [merge merge-changelog] name = GNU-style ChangeLog

Re: [setup] Makefile.am patches

2015-02-16 Thread Corinna Vinschen
On Feb 16 11:22, Eric Blake wrote: On 02/16/2015 02:12 AM, Corinna Vinschen wrote: On Feb 15 17:36, Achim Gratz wrote: Corinna Vinschen writes: We're not going to skip writing ChangeLog entries. If there is some automatism to write *correctly formatted* ChangeLog entries from the git

Re: [setup] Makefile.am patches

2015-02-16 Thread Eric Blake
On 02/15/2015 07:35 AM, Corinna Vinschen wrote: We're not going to skip writing ChangeLog entries. If there is some automatism to write *correctly formatted* ChangeLog entries from the git commit message, then that method can and should be used. Coreutils and several other GNU projects use

Re: [setup] Makefile.am patches

2015-02-16 Thread Eric Blake
On 02/16/2015 02:12 AM, Corinna Vinschen wrote: On Feb 15 17:36, Achim Gratz wrote: Corinna Vinschen writes: We're not going to skip writing ChangeLog entries. If there is some automatism to write *correctly formatted* ChangeLog entries from the git commit message, then that method can and

Re: [setup] Makefile.am patches

2015-02-16 Thread Achim Gratz
Corinna Vinschen writes: Uh, what? You need to keep a blank line between the (brief) commit message and any ChangeLog lines, That's a rule? In theory the subject line is totally useless for a ChangeLog entry, but if that's required, ok, fine. Not so much a rule, but rather a consequence of

Re: [setup] Makefile.am patches

2015-02-16 Thread Jon TURNEY
On 16/02/2015 20:52, Corinna Vinschen wrote: On Feb 16 20:34, Achim Gratz wrote: Corinna Vinschen writes: I'm rather confused now. So I don't need git-merge-changelog for automation and I don't need gitlog-to-changelog if I keep the ChangeLog logs. If I don't need any one of them, what *do*

Re: [setup] Makefile.am patches

2015-02-16 Thread Achim Gratz
Corinna Vinschen writes: I'm more interested in seeing if you can push and how the log message on cygwin-apss-cvs looks like since I made some script changes... Pushed. Regards, Achim. -- +[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+ Samples for the Waldorf Blofeld:

Re: [setup] Makefile.am patches

2015-02-16 Thread Corinna Vinschen
On Feb 16 16:03, Achim Gratz wrote: Corinna Vinschen writes: I'm more interested in seeing if you can push and how the log message on cygwin-apss-cvs looks like since I made some script changes... Pushed. Thanks. The commit message on cygwin-apps-cvs looks decent now, doesn't it? I

Re: [setup] Makefile.am patches

2015-02-16 Thread Corinna Vinschen
On Feb 16 10:52, Achim Gratz wrote: Corinna Vinschen writes: I saw some .gitattributes file mentioning exactly this ChangeLog merging in the binutils-gdb repo and copied it over so it's part of our repo as well. That deals with the problem of merging log files. If you do keep a manual

Re: [setup] Makefile.am patches

2015-02-16 Thread Achim Gratz
Corinna Vinschen writes: I inspected your code and played around with git-tag and git-describe so it's ok. THanks, I'm more interested in seeing if you can push and how the log message on cygwin-apss-cvs looks like since I made some script changes... Later today… Regards, Achim. -- +[Q+

Re: [setup] Makefile.am patches

2015-02-16 Thread Corinna Vinschen
On Feb 15 17:36, Achim Gratz wrote: Corinna Vinschen writes: We're not going to skip writing ChangeLog entries. If there is some automatism to write *correctly formatted* ChangeLog entries from the git commit message, then that method can and should be used. If they're correctly

Re: [setup] Makefile.am patches

2015-02-16 Thread Achim Gratz
Corinna Vinschen writes: I saw some .gitattributes file mentioning exactly this ChangeLog merging in the binutils-gdb repo and copied it over so it's part of our repo as well. That deals with the problem of merging log files. If you do keep a manual log just about any merge would create a

Re: [setup] Makefile.am patches

2015-02-15 Thread Corinna Vinschen
On Feb 14 20:06, Achim Gratz wrote: First patch to follow the usual convention of using annotated release tags for determining the version (tag 4782666e90 as release_2.869 for testing). I'm at a loss. Right now, after my last checkin, we're simply continuing to use the ChangeLog version

Re: [setup] Makefile.am patches

2015-02-15 Thread Achim Gratz
Corinna Vinschen writes: On Feb 14 20:06, Achim Gratz wrote: First patch to follow the usual convention of using annotated release tags for determining the version (tag 4782666e90 as release_2.869 for testing). I'm at a loss. Right now, after my last checkin, we're simply continuing to

[setup] Makefile.am patches

2015-02-14 Thread Achim Gratz
First patch to follow the usual convention of using annotated release tags for determining the version (tag 4782666e90 as release_2.869 for testing). From 8d41c6e21673ce22f30e1b4738fe0bf7cdf7e09a Mon Sep 17 00:00:00 2001 From: Achim Gratz strom...@stromeko.de Date: Sat, 14 Feb 2015 18:42:12