Re: GNU-style ChangeLog merge driver for Git

Eric Blake wrote: > As of git 1.5.4, > you can do 'git pull --rebase', to rebase all your local changes on the > current > branch on top of whatever upstream changes were made in the meantime > ... > Oops - this put the upstream ChangeLog entries at the top of the file, in > front > of my entr

Re: GNU-style ChangeLog merge driver for Git

Bruno Haible clisp.org> writes: > Benoit Sigoure explained that what we need to solve this problem is a > git "merge driver". Here is such a merge driver. It should solve the > problem. > > > /* Heuristic to determine whether it's a pull in downstream direction >(e.g. pull from a ce

Re: GNU-style ChangeLog merge driver for Git

Bruno Haible <[EMAIL PROTECTED]> wrote: > James Youngman wrote: >> These days, I use a ChangeLog-format change message as my GIT commit >> message, which solves most of the problem. It's still not that >> convenient, sadly, because >> (1) I have not yet taken the time to wrap Emacs' add-change-lo

Re: GNU-style ChangeLog merge driver for Git

James Youngman wrote: > These days, I use a ChangeLog-format change message as my GIT commit > message, which solves most of the problem. It's still not that > convenient, sadly, because > (1) I have not yet taken the time to wrap Emacs' add-change-log-entry > so that it creates a new file for use

Re: GNU-style ChangeLog merge driver for Git

On Feb 12, 2008 2:41 AM, Micah Cowan <[EMAIL PROTECTED]> wrote: > OTOH, a more difficult problem might be: how do you go about fixing > erroneous commit logs? In Subversion and CVS, this can be dealt with if > you have appropriate privileges; but in Mercurial at least (and probably > Git as well?)

Re: GNU-style ChangeLog merge driver for Git

* Bruno Haible wrote on Tue, Feb 12, 2008 at 12:13:41AM CET: > > > This creates a file > > $prefix/share/dummy/javaversion.class > > > > Surely that 'dummy' is weird, but the file should not be needed at all, > > no? > > I cannot reproduce this. You must have an extraneous dependency to the >

Re: GNU-style ChangeLog merge driver for Git

Jim Meyering wrote: > However, for those who would like a real ChangeLog file, I may simply > add a Makefile rule like the one already in Makefile.am that will > generate it upon demand. This would be useful, yes. Or - since the ChangeLog is part of what should be distributed and not erased by "ma

Re: GNU-style ChangeLog merge driver for Git

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Karl Berry wrote: > I don't think it's exactly "recommended"; it's mentioned as an > alternative, but in a rather ambiguous way (at least if we're talking > about the same thing, in the Change Log Concepts node of standards.texi): > >Another a

Re: GNU-style ChangeLog merge driver for Git

Huh. Well, considering that the GNU Coding Guidelines specifically recommend this technique as an alternative to maintaining an actual file, I don't think it's exactly "recommended"; it's mentioned as an alternative, but in a rather ambiguous way (at least if we're talking about the s

Re: GNU-style ChangeLog merge driver for Git

The web interface for the history is also usable without prerequisite knowledge; but it is not searchable. It is also not accessible to people without access to the big bad internet; or funky GUI tools. > maintaining ChangeLogs is redundant work, when you're already > entering the ver

Re: GNU-style ChangeLog merge driver for Git

Ben Pfaff wrote: > The web interface is searchable. Type your search string into > the box labeled "search:" and hit Enter. Click on the question > mark for a description of the kinds of searches that are > available. Indeed! Thanks for pointing this out. This weakens my p

Re: GNU-style ChangeLog merge driver for Git

Hello Ralf, > A couple of minor nits: > > * Bruno Haible wrote on Mon, Feb 11, 2008 at 01:15:47AM CET: > > bin_PROGRAMS = git-merge-changelog > > git_merge_changelog_LDADD = -L. -lgnu > > Please make this > git_merge_changelog_LDADD = libgnu.a > > so that automake notices and adds the depend

Re: GNU-style ChangeLog merge driver for Git

Eric Blake wrote: > I wonder if this would be worth pushing upstream for inclusion in git proper. Yes, this should be considered, after a testing phase of - say - two weeks. > if a project uses the git-merge-changelog module ... > ... Shouldn't this be a noinst target? The git-merge-changelog mo

Re: GNU-style ChangeLog merge driver for Git

Mike Frysinger wrote: > > > maintaining ChangeLogs is redundant work, when you're already entering > > > the very same information into the version control system. > > > > Please place yourself at the position of the user who builds and runs a > > program, not the developer. ... > > how is the use

Re: GNU-style ChangeLog merge driver for Git

Bruno Haible <[EMAIL PROTECTED]> wrote: > Jim Meyering wrote yesterday: >> With the proliferation of "topic branches" in my work-flow, it is not >> effective for me to version-control ChangeLog files (too many pointless >> conflicts). So, for projects that I control, I am transitioning away >> fro

Re: GNU-style ChangeLog merge driver for Git

Ben Pfaff wrote: > The web interface is searchable. Type your search string into > the box labeled "search:" and hit Enter. Click on the question > mark for a description of the kinds of searches that are > available. Indeed! Thanks for pointing this out. This weakens my previous arguments. Br

Re: GNU-style ChangeLog merge driver for Git

Hello Bruno, A couple of minor nits: * Bruno Haible wrote on Mon, Feb 11, 2008 at 01:15:47AM CET: > bin_PROGRAMS = git-merge-changelog > git_merge_changelog_LDADD = -L. -lgnu Please make this git_merge_changelog_LDADD = libgnu.a so that automake notices and adds the dependency, so that a par

Re: GNU-style ChangeLog merge driver for Git

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 According to Bruno Haible on 2/11/2008 5:35 AM: |> The README and installation instructions are in the source code (for now). First, a big thanks for doing this. Also, I wonder if this would be worth pushing upstream for inclusion in git proper. |

Re: GNU-style ChangeLog merge driver for Git

> The README and installation instructions are in the source code (for now). It turns out that we can put the .gitattributes into the repository: if someone does not have the git-merge-changelog configured, it will have no effect for him. I also renamed it from "cl-merge" to "merge-changelog", fo

Re: GNU-style ChangeLog merge driver for Git

Hello Bruno, * Bruno Haible wrote on Mon, Feb 11, 2008 at 01:15:47AM CET: > 2008-02-10 Bruno Haible <[EMAIL PROTECTED]> > > New module 'git-merge-changelog'. > * modules/git-merge-changelog: New file. > * lib/git-merge-changelog.c: New file. *Thank* *you* for this, and to Jim

Re: GNU-style ChangeLog merge driver for Git

On Sunday 10 February 2008, Bruno Haible wrote: > Micah Cowan wrote: > > Are you claiming that people who are capable of fetching the sources > > with "git clone" will be incapable of "git log"? > > Most of them, yes, sure. The "git clone" command is shown in the > homepage

Re: GNU-style ChangeLog merge driver for Git

Bruno Haible <[EMAIL PROTECTED]> writes: > The web interface for the history is also usable without prerequisite > knowledge; but it is not searchable. The web interface is searchable. Type your search string into the box labeled "search:" and hit Enter. Click on the question mark for a descrip

Re: GNU-style ChangeLog merge driver for Git

Micah Cowan wrote: > Are you claiming that people who are capable of fetching the sources > with "git clone" will be incapable of "git log"? Most of them, yes, sure. The "git clone" command is shown in the homepage and in gnulib's README. Millions of people ca

Re: GNU-style ChangeLog merge driver for Git

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Bruno Haible wrote: > Jim Meyering wrote yesterday: >> With the proliferation of "topic branches" in my work-flow, it is not >> effective for me to version-control ChangeLog files (too many pointless >> conflicts). So, for projects that I control, I a

GNU-style ChangeLog merge driver for Git (was: Re: [PATCH] New script and module: gitlog-to-changelog)

Jim Meyering wrote yesterday: > With the proliferation of "topic branches" in my work-flow, it is not > effective for me to version-control ChangeLog files (too many pointless > conflicts). So, for projects that I control, I am transitioning away > from that. ... > Instead, now, I compose ChangeL

Re: GNU-style ChangeLog merge driver for Git

Hello Benoit, > Akim Demaille would also like it to squash the commits added by the > merge (the new commits in OTHERS): > > -MM-DD Author <[EMAIL PROTECTED]> > > Merge whatever: > > -MM-DD Someone Else <[EMAIL PROTECTED]> > Some change. > * FileChanged.c:

GNU-style ChangeLog merge driver for Git (was: Re: git: avoiding merges, rebasing)

On Oct 9, 2007, at 2:03 PM, Bruno Haible wrote: Hello Benoit, Thanks for working on this. But this merge driver has a few major nits. 1) While my ChangeLog file was locally unmodified but some pulled in commits should modify it, "git pull" stopped and said: ChangeLog: needs update f