From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Sep 2010, #07; Wed, 29)
Date: Wed, 29 Sep 2010 21:22:24 -0600 [thread overview]
Message-ID: <AANLkTikf8DogBmprAxh+VusQvn5e3BOJz41fn+5Uiu9k@mail.gmail.com> (raw)
In-Reply-To: <7vocbgkrw5.fsf@alter.siamese.dyndns.org>
Hi,
On Wed, Sep 29, 2010 at 6:16 PM, Junio C Hamano <gitster@pobox.com> wrote:
> * en/rename-d-f (2010-09-08) 2 commits
> - merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
> - t3509: Add rename + D/F conflict testcase that recursive strategy fails
>
> I am not entirely convinced this is a regression free band-aid; need to
> look at this a few more times.
When you rerolled pu after 1.7.3, I noticed this series missing, and
thought I should combine it with my en/merge-recursive series (which
would mean keeping the testcase patch, but the other patch morphs a
bit as it combines with one of the patches from the bigger series).
Now, I'm curious if I should have kept it separate. Preferences?
Also, although not mentioned in this what's cooking email, I noticed
you also merged en/merge-recursive into pu. I'll note that there a
couple regression I know of in that series, particularly in handling
of cases with o->call_depth>0. They're pretty rare so the series
might be safe enough for pu, but I thought you should know they are
there. In particular,
* Some of the tests break on MacOS X due to it's weird "wc"
* a combined D/F conflict at <path> when there is also a conflict of
some sort at <path>.<ext> can result in <path> not being correctly
removed and git being unable to populate <path>/*.
* Some D/F conflicts combined with criss-cross merges result in a
premature git exit with "BUG: There are unmerged index entries" when
merging merge-bases.
The first two were trivial to fix; I've got them in a reroll I'm
preparing. The third one, if only interested about regressions
relative to master rather than making sure the merge is performed
correctly, I believe is relatively easy. But the more general case of
solving all the o->call_depth>0 case is going to be difficult. I've
started a separate thread about that.
Elijah
next prev parent reply other threads:[~2010-09-30 3:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-30 0:16 What's cooking in git.git (Sep 2010, #07; Wed, 29) Junio C Hamano
2010-09-30 3:22 ` Elijah Newren [this message]
2010-10-02 8:12 ` Pascal Obry
2010-10-03 4:36 ` Joshua Jensen
2010-10-03 13:30 ` Elijah Newren
2010-10-03 23:34 ` Junio C Hamano
2010-10-10 21:26 ` SZEDER Gábor
2010-10-12 21:26 ` SZEDER Gábor
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=AANLkTikf8DogBmprAxh+VusQvn5e3BOJz41fn+5Uiu9k@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).