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
-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
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
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
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
-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
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
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
-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
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
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
11 matches
Mail list logo
