From: Alex Riesen <raa.lkml@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jul 2009, #02; Sun, 26)
Date: Mon, 27 Jul 2009 16:09:56 +0200 [thread overview]
Message-ID: <81b0412b0907270709kd6a5b8fy51829099d7b488e5@mail.gmail.com> (raw)
In-Reply-To: <7viqhfrfu5.fsf@alter.siamese.dyndns.org>
On Sun, Jul 26, 2009 at 10:47, Junio C Hamano<gitster@pobox.com> wrote:
> * ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
> - Fix for a merge where a branch has an F->D transition
> - Add a reminder test case for a merge with F/D transition
>
> Although the reported breakage is covered with the patch, Alex feels the
> solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
> may be long overdue but seems to be a hard problem.
Maybe promote the testcase patch to master and drop (or leave it in
next) the other patch?
So that the reminder reminds not only people running next but also anyone who
happens to look at the output of their test suite run.
next prev parent reply other threads:[~2009-07-27 14:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-26 8:47 What's cooking in git.git (Jul 2009, #02; Sun, 26) Junio C Hamano
2009-07-26 9:08 ` Jakub Narebski
2009-07-26 10:32 ` en/fast-export, was " Johannes Schindelin
2009-07-26 10:35 ` db/transport-shim, " Johannes Schindelin
2009-07-26 14:08 ` Michael Haggerty
2009-07-26 17:27 ` gp/maint-rebase-p-onto, was " Johannes Schindelin
2009-07-26 17:28 ` Johannes Schindelin
2009-07-27 14:09 ` Alex Riesen [this message]
2009-07-28 7:27 ` Paolo Bonzini
2009-07-28 8:01 ` Junio C Hamano
2009-07-28 8:09 ` Paolo Bonzini
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81b0412b0907270709kd6a5b8fy51829099d7b488e5@mail.gmail.com \
--to=raa.lkml@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.
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 NNTP newsgroup(s).