Re: git-merge-changelog crash

2009-07-15 Thread Rolf Bjarne Kvinge
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-

git-merge-changelog crash

2009-07-15 Thread Rolf Bjarne Kvinge
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 1469ASSERT (entry_equals (ancestor_fil

Help with create_pipe_bidi

2009-07-15 Thread Akim Demaille
Hi gnuliebers, First a disclaimer: I'm far from being fluent with fd business, I'm probably asking newbie questions... We, at Bison Corp., have some bug occurring on Tru64 (http://lists.gnu.org/archive/html/bug-bison/2009-06/msg4.html ) that seems to be related with our piping into GNU M

Re: git-merge-changelog crash

2009-07-15 Thread Bruno Haible
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

git-merge-changelog crash

2009-07-15 Thread Rolf Bjarne Kvinge
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 1469ASSERT (entry_equals (ancestor_f