From: Shawn Pearce <spearce@spearce.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: More merge-recursive woes
Date: Wed, 13 Dec 2006 15:34:10 -0500 [thread overview]
Message-ID: <20061213203410.GB32568@spearce.org> (raw)
In-Reply-To: <Pine.LNX.4.63.0612131526180.3635@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Wed, 13 Dec 2006, Shawn Pearce wrote:
>
> > Bug #1: If one branch renames a file which existed in the merge base,
> > when we merge that change into a different branch the old version of the
> > file is not deleted from the working directory. The attached test
> > script shows this ("BAD: A still exists in working directory").
>
> You miss a ":" at the end of the test script, BTW.
>
> This bug is fixed by your patch, which makes remove_file() update the
> working directory in the last stage.
Yes; and if you noticed this message got hung up in the email
system while I found the bug, fixed the bug, and replied to your
correction of the fix. And I also fixed the test script along
the way. Silly email systems holding messages. *sigh*
> > Bug #2: In that horrible repository that I have where I ran into the
> > empty tree missing bug I now have a pair of commits which when merged
> > together cause git-merge-recursive to go into an infinite loop,
> > or least burn CPU for hours on end without doing squat. I have
> > not been able to get enough data to even write a good analysis
> > of it yet. I'll try to do that this week, as I cannot share the
> > repository itself. It just happens to be two new commits along
> > the same two branches however. :-(
>
> Could you please send me the rev-list output for this test case?
I'm actually going to go back in later tonight to try and figure
this one out. Whatever data I get I'll be sure to include the
rev-list --parents output from this case as well; unless I can
craft a really small test case which causes the same infinite loop.
--
prev parent reply other threads:[~2006-12-13 20:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-13 7:36 More merge-recursive woes Shawn Pearce
2006-12-13 14:28 ` Johannes Schindelin
2006-12-13 20:34 ` Shawn Pearce [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061213203410.GB32568@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).