Re: git-merge-changelog and EOL format on Windows

> Date: Mon, 20 Jan 2014 03:57:40 +0100 (CET) > From: Bruno Haible > Cc: br...@clisp.org > > > no similar explanation is provided for the output. > > The explanation is the general "Newline Guidelines" from unicode.org: > p. 156 > ru

Re: git-merge-changelog and EOL format on Windows

Hi Eli, Thank you for the suggestion. > no similar explanation is provided for the output. The explanation is the general "Newline Guidelines" from unicode.org: p. 156 rule R3a:   "If the intended target is unknown, map to the platfo

Re: git-merge-changelog

> The only special "program" in gnulib is git-merge-changelog; > though now that I think about it, it makes more sense to split > out git-merge-changelog into a seperate project. Yes, you're entirely right. The project has been created already: http://savannah.gnu.org/projects/vc-ch

Re: git-merge-changelog

Hi Alfred, > The only special "program" in gnulib is git-merge-changelog; though now > that I think about it, it makes more sense to split out > git-merge-changelog into a seperate project. Yes, you're entirely right. The project has been created already: http://savannah.gnu.org/projects/vc-chang

Re: git-merge-changelog in bin_PROGRAMS

What about this? I haven't tried it, but I think it should work. The only special "program" in gnulib is git-merge-changelog; though now that I think about it, it makes more sense to split out git-merge-changelog into a seperate project. 2012-01-03 Alfred M. Szmidt * modules/git-merg

Re: git-merge-changelog in bin_PROGRAMS

> It seems that git-merge-changelog is added to bin_PROGRAMS in the > generated lib/Makefile.am, which causes it to get installed in > exec_prefix/bin (at least in inetutils). Not sure why though It's necessary so that the installation instructions at the top of this file work. "ma

Re: git-merge-changelog in bin_PROGRAMS

Alfred M. Szmidt wrote: > It seems that git-merge-changelog is added to bin_PROGRAMS in the > generated lib/Makefile.am, which causes it to get installed in > exec_prefix/bin (at least in inetutils). Not sure why though It's necessary so that the installation instructions at the top of this file

Re: git-merge-changelog limitation?

On 10/05/2010 04:05 PM, Bruno Haible wrote: Well, I would consider it a bug in git if it didn't invoke the declared merge driver. That is the point of a custom merge driver. My understanding is that git only invokes the custom merge driver IF there was a diff conflict. But when the default gi

Re: git-merge-changelog limitation?

Hi Eric, > Hmm, ChangeLog now has some out-of-order entries. This is probably due > to me working on the rename before Paul's patch for additional tr fixes, > with two ChangeLog paragraphs grouped under one date Yes, I agree, it looks like this. > at which point I did 'git pull --rebase'. I

Re: git-merge-changelog: mention --split-merged-entry in the header comment.

* Bruno Haible wrote on Sun, May 23, 2010 at 06:12:46PM CEST: > > Also, I noticed that this file is copyrighted by you, not to the FSF > > Oversight? > > Some day, I intend to put this into a better place than gnulib, or have it > distributed as a contrib in git. Don't know. - Since git is GPLv2 a

Re: git-merge-changelog: mention --split-merged-entry in the header comment.

Hi Eric, > merge neighboring entries if > they share the same author and date, to get a rebased series to use the > same style as the original branch, so that the mere act of rebasing > doesn't break the author's style of merged entries? I can imagine an option that would serve this purpose (for

Re: git-merge-changelog: mention --split-merged-entry in the header comment.

On 05/23/2010 10:12 AM, Bruno Haible wrote: > Hi Ralf, > >> I only now became aware of the --split-merged-entry option which >> git-merge-changelog provides, because I never bothered to look at --help >> output > > Whereas I was aware of the option, but thought I would never need it, > and was th

Re: git-merge-changelog: mention --split-merged-entry in the header comment.

Hi Ralf, > I only now became aware of the --split-merged-entry option which > git-merge-changelog provides, because I never bothered to look at --help > output Whereas I was aware of the option, but thought I would never need it, and was then surprised to have conflicts in ChangeLog at each step

Re: git-merge-changelog crash

Rolf Bjarne Kvinge wrote: > >> Attached are three files (o-file, a-file and b-file) which when run with > >> git-merge-changelog causes an assertion in: > >> > >> #3 0x08049985 in main (argc=Cannot access memory at address 0x34a6) at > >> git-merge-changelog.c:1469 > >> 1469

Re: git-merge-changelog crash

Hi, Actually I'm not sure what I messed up, but I cleaned up every trace of the merge driver and re-installed it, and now it doesn't crash anymore. Sorry for wasting your time. Rolf > Hi, > > Rolf Bjarne Kvinge wrote: >> Attached are three files (o-file, a-file and b-file) which when run with

Re: git-merge-changelog crash

Hi again, My typical use case is this: I work with git-svn, and have two branches, master, which tracks the remote svn repository, and a branch I work on 'work-branch'. work-branch is always rebased with master before doing anything else, so work-branch contains master + my work Now i cherry-

Re: git-merge-changelog crash

Hi, Rolf Bjarne Kvinge wrote: > Attached are three files (o-file, a-file and b-file) which when run with > git-merge-changelog causes an assertion in: > > #3 0x08049985 in main (argc=Cannot access memory at address 0x34a6) at > git-merge-changelog.c:1469 > 1469

Re: git-merge-changelog question

Hi Eric, > Is it also worth addressing the root cause of this? After all, it was > git-merge-changelog that created file1 with more than 1 exact copy in the > first place (via the earlier round of merging); it seems like it would be > better for git-merge-changelog to fail with a merge conflict i

Re: git-merge-changelog question

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 According to Bruno Haible on 7/4/2009 3:26 AM: > Fix assertion. > * lib/git-merge-changelog.c (compute_mapping): In the case where file1 > contains more exact copies of a given entry than file2, leave the extra > copies unpaired

Re: git-merge-changelog question

Eric Blake wrote: > This time, git removes the temporary .merge_file_*, but I confirmed that > they can be recreated via: > > $ git show 5f008b:ChangeLog > file1 > $ git show 0b17f4:ChangeLog > file2 > $ git show cd172d:ChangeLog > file3 > $ git-merge-changelog --split-merged-entry file[123] Than

Re: git-merge-changelog question

Eric Blake byu.net> writes: > And under the new. It is triggering an ASSERT failure, and I've traced it to > the fact that branch-1.4's ChangeLog has identical entries, and one entry from > branch-1.6 refuses to map back to two entries of branch-1.4 (I'm now searching > for which botched co

Re: git-merge-changelog question

Eric Blake byu.net> writes: > According to Bruno Haible on 7/2/2009 5:17 PM: > > Now, can you show me a crashing situation, please (with either the old or the > > new git-merge-changelog)? > > Found one. This crashes under the old: And under the new. It is triggering an ASSERT failure, and I

Re: git-merge-changelog question

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 According to Bruno Haible on 7/2/2009 5:17 PM: > Now, can you show me a crashing situation, please (with either the old or the > new git-merge-changelog)? Found one. This crashes under the old: $ git clone git://git.sv.gnu.org/m4.git $ cd m4 $ git r

Re: git-merge-changelog question

Hi Eric, And with this patch, you get decent performance. $ time git cherry-pick cd172d9 Finished one cherry-pick. [master d8ac2b5] Fix description of limits on diversions. 3 files changed, 13 insertions(+), 5 deletions(-) real0m0.425s user0m0.300s sys 0m0.128s Now, can you show me

Re: git-merge-changelog question

Hi Eric, > Here's a sequence of steps, comparable to what I tried to use to generate > 14b8a31ef on the master branch (cherry-picked from branch-1.6). The > example below uses hashes instead of symbolic names, in case you want to > reproduce this even when the branches have advanced. Notice that

Re: git-merge-changelog question

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 According to Bruno Haible on 6/30/2009 2:28 PM: > Hi Eric, > >> git-merge-changelog either segfaults > > Ouch. It's written as defensively as possible, and checked with valgrind. > Therefore I thought that was impossible! I haven't been found a simp

Re: git-merge-changelog question

I've repeatedly encountered a situation where git-merge-changelog is a hindrance rather than a help. Any time I commit a patch on one branch, then want to run 'git cherry-pick' to copy it to another, git-merge-changelog either segfaults or goes into a super-long processing loop trying to resolv

Re: git-merge-changelog question

Hi Eric, > git-merge-changelog either segfaults Ouch. It's written as defensively as possible, and checked with valgrind. Therefore I thought that was impossible! > Any time I commit a patch on one branch, > then want to run 'git cherry-pick' to copy it to another, > git-merge-changelog either s

Re: git-merge-changelog usage error during rebase

On Mon, Mar 9, 2009 at 12:42 AM, James Youngman wrote: > $ git rebase master > First, rewinding head to replay your work on top of it... > Applying Update to version 0.17 of GNU gettext. > error: patch failed: ChangeLog:41 > error: ChangeLog: patch does not apply > Using index info to reconstruct

Re: git-merge-changelog usage error during rebase

On Mon, Mar 9, 2009 at 12:42 AM, James Youngman wrote: > $ git checkout jy/auto-gettext > Switched to branch "jy/auto-gettext" > $ git rebase master > First, rewinding head to replay your work on top of it... > Applying Update to version 0.17 of GNU gettext. > error: patch failed: ChangeLog:41 > e