* [RFC] Add a .gitattributes file for use with git-merge-changelog @ 2014-06-20 2:28 Samuel Bronson 2014-06-20 14:08 ` Tom Tromey 0 siblings, 1 reply; 6+ messages in thread From: Samuel Bronson @ 2014-06-20 2:28 UTC (permalink / raw) To: binutils, gdb-patches; +Cc: gcc-patches [Am I really supposed to CC this to gcc@ like binutils/MAINTAINERS says I should?] Individual users will still have to: 1. Install git-merge-changelog 2. Set up the merge driver in their git config See gnulib's lib/git-merge-changelog.c [1] for details. For example, I: 1. Patched Debian's gnulib package to build git-merge-changelog, and sent the patch to the Debian maintainer, who then proceeded to not only accept my patch but even write a *manpage* for git-merge-changelog! (Let's hear it for Ian Beckwith.) So now, I can install it simply by running "apt-get install git-merge-changelog". (Except, of course, that I already have it installed from when I was testing my patch.) 2. Added this to my ~/.gitconfig: --8<---------------cut here---------------start------------->8--- [merge "merge-changelog"] name = GNU-style ChangeLog merge driver driver = git-merge-changelog %O %A %B --8<---------------cut here---------------end--------------->8--- (You could just put it in the .git/config file for a given repository, but I can't really see much point in that.) With this patch applied and the above two tasks done by whatever means you deem best, you can say goodbye to merge conflicts in ChangeLog files. *IF* people will stop renaming the danged things, anyway. [1]: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c [Note: The docs for git-merge-changelog (the comments at the top) say you need a .gitattributes in every directory. The docs are wrong. Ignore the docs. You really only need one at the top level, since .gitattributes uses the same pattern matching rules as .gitignore, which match files in any subdirectory unless you prefix the pattern with a "/".] [Note 2: I already have copyright assignment papers on file for GDB.] --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..75abe79 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +# See gnulib's lib/git-merge-changelog.c (or git-merge-changelog(1)) +# to activate this +ChangeLog merge=merge-changelog -- 2.0.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC] Add a .gitattributes file for use with git-merge-changelog 2014-06-20 2:28 [RFC] Add a .gitattributes file for use with git-merge-changelog Samuel Bronson @ 2014-06-20 14:08 ` Tom Tromey [not found] ` <87k38bgp7w.fsf@naesten.mooo.com> 0 siblings, 1 reply; 6+ messages in thread From: Tom Tromey @ 2014-06-20 14:08 UTC (permalink / raw) To: Samuel Bronson; +Cc: binutils, gdb-patches, gcc-patches >>>>> "Samuel" == Samuel Bronson <naesten@gmail.com> writes: Samuel> [Am I really supposed to CC this to gcc@ like binutils/MAINTAINERS Samuel> says I should?] I think just for files that are intended to be put in both trees and shared. Samuel> Individual users will still have to: Samuel> 1. Install git-merge-changelog Samuel> 2. Set up the merge driver in their git config What happens if they do not? Tom ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <87k38bgp7w.fsf@naesten.mooo.com>]
* Re: [RFC] Add a .gitattributes file for use with git-merge-changelog [not found] ` <87k38bgp7w.fsf@naesten.mooo.com> @ 2014-06-28 23:41 ` Samuel Bronson 2014-07-08 1:36 ` Samuel Bronson 0 siblings, 1 reply; 6+ messages in thread From: Samuel Bronson @ 2014-06-28 23:41 UTC (permalink / raw) To: binutils; +Cc: gcc-patches, gdb-patches Ouch; it looks like my last attempt to reply to this missed gdb-patches@ due to a gmane accident? Samuel Bronson <naesten@gmail.com> writes: > Tom Tromey <tromey@redhat.com> writes: >>>>>>> "Samuel" == Samuel Bronson <naesten@gmail.com> writes: >> >> Samuel> [Am I really supposed to CC this to gcc@ like binutils/MAINTAINERS >> Samuel> says I should?] >> >> I think just for files that are intended to be put in both trees and >> shared. > > Well, they're certainly welcome to add such a file to their repository. > >> Samuel> Individual users will still have to: >> Samuel> 1. Install git-merge-changelog >> Samuel> 2. Set up the merge driver in their git config >> >> What happens if they do not? > > Not much; git just falls back to the default ("text") merge driver in > that case. (This appears to have been so obvious that nobody actually > bothered to document it?) > > I find myself wondering: how much commentary should go into the > .gitattributes file, and do such files get ChangeLog entries? > > -- > Hi! I'm a .signature virus! Copy me into your ~/.signature to help me spread! > > -- Hi! I'm a .signature virus! Copy me into your ~/.signature to help me spread! ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC] Add a .gitattributes file for use with git-merge-changelog 2014-06-28 23:41 ` Samuel Bronson @ 2014-07-08 1:36 ` Samuel Bronson 2014-07-08 8:50 ` Pedro Alves 0 siblings, 1 reply; 6+ messages in thread From: Samuel Bronson @ 2014-07-08 1:36 UTC (permalink / raw) To: binutils; +Cc: gcc-patches, gdb-patches Ping? If nobody has anything else to say, I'm going to assume that such a change is unobjectionable, and should not be listed in the ChangeLog. Samuel Bronson <naesten@gmail.com> writes: > Ouch; it looks like my last attempt to reply to this missed gdb-patches@ > due to a gmane accident? > > Samuel Bronson <naesten@gmail.com> writes: > >> Tom Tromey <tromey@redhat.com> writes: >>>>>>>> "Samuel" == Samuel Bronson <naesten@gmail.com> writes: >>> >>> Samuel> [Am I really supposed to CC this to gcc@ like binutils/MAINTAINERS >>> Samuel> says I should?] >>> >>> I think just for files that are intended to be put in both trees and >>> shared. >> >> Well, they're certainly welcome to add such a file to their repository. >> >>> Samuel> Individual users will still have to: >>> Samuel> 1. Install git-merge-changelog >>> Samuel> 2. Set up the merge driver in their git config >>> >>> What happens if they do not? >> >> Not much; git just falls back to the default ("text") merge driver in >> that case. (This appears to have been so obvious that nobody actually >> bothered to document it?) >> >> I find myself wondering: how much commentary should go into the >> .gitattributes file, and do such files get ChangeLog entries? -- Hi! I'm a .signature virus! Copy me into your ~/.signature to help me spread! ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC] Add a .gitattributes file for use with git-merge-changelog 2014-07-08 1:36 ` Samuel Bronson @ 2014-07-08 8:50 ` Pedro Alves 2014-07-25 22:52 ` [COMMIT] " Samuel Bronson 0 siblings, 1 reply; 6+ messages in thread From: Pedro Alves @ 2014-07-08 8:50 UTC (permalink / raw) To: Samuel Bronson, binutils; +Cc: gcc-patches, gdb-patches Hi Samuel, This seems like a good idea to me. On 07/08/2014 02:35 AM, Samuel Bronson wrote: > Ping? If nobody has anything else to say, I'm going to assume that such > a change is unobjectionable, and should not be listed in the ChangeLog. When in doubt, look for precedence. grep will show changes to other .git* files were listed in ChangeLog: $ grep "\.git" ChangeLog* gdb/ChangeLog* ChangeLog: * .gitignore: Import from gdb repository. ChangeLog: * .gitignore: New file. gdb/ChangeLog-2011: * .gitignore: New file. gdb/ChangeLog-2012: * .gitignore: Add go-exp.c. gdb/ChangeLog-2012: * .gitignore: Ignore more files. gdb/ChangeLog-2012: * .gitignore (/gdbtui): Remove. gdb/ChangeLog-2013: * .gitignore: Add /gcore. Likewise 'git log .gitignore gdb/.gitignore'. -- Pedro Alves ^ permalink raw reply [flat|nested] 6+ messages in thread
* [COMMIT] Add a .gitattributes file for use with git-merge-changelog 2014-07-08 8:50 ` Pedro Alves @ 2014-07-25 22:52 ` Samuel Bronson 0 siblings, 0 replies; 6+ messages in thread From: Samuel Bronson @ 2014-07-25 22:52 UTC (permalink / raw) To: Pedro Alves; +Cc: binutils, gcc-patches, gdb-patches Individual users will still have to: 1. Install git-merge-changelog 2. Set up the merge driver in their git config See gnulib's lib/git-merge-changelog.c [1] for details. For example, I: 1. Patched Debian's gnulib package to build git-merge-changelog, and sent the patch to the Debian maintainer, who then proceeded to not only accept my patch but even write a *manpage* for git-merge-changelog! (Let's hear it for Ian Beckwith.) So now, I can install it simply by running "apt-get install git-merge-changelog". (Except, of course, that I already have it installed from when I was testing my patch.) 2. Did step (2) from .gitattributes With this patch applied and the above two steps done by whatever means you deem best, you can say goodbye to merge conflicts in ChangeLog files -- at least *IF* people stop renaming the danged things, anyway. If you don't do step 2, you will continue to suffer from ChangeLog merge conflicts exactly as before, whether or not you did step 1. If you do step 2 but not step 1, git will likely start complaining that it can't find any "git-merge-changelog" to run. [1]: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c [Note: The docs for git-merge-changelog (the comments at the top) say that you need a .gitattributes in every directory. The docs are wrong. Ignore the docs. Well, not the whole docs; just that part. You really only need one at the top level, since .gitattributes uses the same pattern matching rules as .gitignore, which match files in any subdirectory unless you prefix the pattern with a "/", as explained in the gitignore(5) manpage.] --- .gitattributes | 20 ++++++++++++++++++++ ChangeLog | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..06d51d2 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,20 @@ +# -*- conf -*- + +## Set merge driver for ChangeLog files +# See gnulib's lib/git-merge-changelog.c (or git-merge-changelog(1)) +# for per-user setup instructions. +# +# The short version of this (optional) procedure is: +# +# (1) Install git-merge-changelog (this is the tricky part!) +# +# (2) Add something like the following to your ~/.gitconfig: +# +# [merge "merge-changelog"] +# name = GNU-style ChangeLog merge driver +# driver = git-merge-changelog %O %A %B +# +# (3) Enjoy mostly effortless ChangeLog merges, at least until the +# file gets renamed again ... + +ChangeLog merge=merge-changelog diff --git a/ChangeLog b/ChangeLog index 16047d3..5c8fe15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-07-25 Samuel Bronson <naesten@gmail.com> + + * .gitattributes: New file for use with git-merge-changelog. + 2014-07-21 Joel Sherrill <joel.sherrill@oarcorp.com> Disable gdb for or1k*-*-* until supported -- 2.0.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-07-25 22:40 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-06-20 2:28 [RFC] Add a .gitattributes file for use with git-merge-changelog Samuel Bronson 2014-06-20 14:08 ` Tom Tromey [not found] ` <87k38bgp7w.fsf@naesten.mooo.com> 2014-06-28 23:41 ` Samuel Bronson 2014-07-08 1:36 ` Samuel Bronson 2014-07-08 8:50 ` Pedro Alves 2014-07-25 22:52 ` [COMMIT] " Samuel Bronson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).