[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git-merge-changelog crash
From: |
Rolf Bjarne Kvinge |
Subject: |
Re: git-merge-changelog crash |
Date: |
Wed, 15 Jul 2009 16:38:55 +0200 |
User-agent: |
Opera Mail/10.00 (Linux) |
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-pick a commit from work-branch onto master, commit (to svn also
using 'git svn dcommit')
After this I 'git svn rebase -l' the work-branch.
Now once in a while git leaves the commit I cherry-picked in, with one issue:
it contains only the ChangeLogs, effectively duplicating all the entries (since
work-branch also contains the latest commit from master, which has all the
changes I cherry-picked).
I detect this (no problem really), and I do "git rebase -i <latest commit from
master>" and comment out the bad commit with only changelogs to remove it
completely. Problem is that now the merge driver crashes during the rebase
process (like in the sample I sent a few minutes ago)
Rolf
> Hi,
>
> 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 ASSERT (entry_equals
> (ancestor_file.entries[i],
>
> Note that I updated git-merge-changelog today, so the recent assert
> fixes didn't fix this issue.
>
> I'm working on a feature branch and this happens when I cherry-pick one
> commit from that feature feature to another branch.
>
> Rolf
>
>
>
>
--
Using Opera's revolutionary e-mail client: http://www.opera.com/mail/