From: Johannes Sixt <j.sixt@viscovery.net>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: bill lam <cbill.lam@gmail.com>, git <git@vger.kernel.org>
Subject: Re: rebase hint unmerged file removed
Date: Tue, 25 Aug 2009 09:35:49 +0200 [thread overview]
Message-ID: <4A939455.5030908@viscovery.net> (raw)
In-Reply-To: <4A92A6E6.5060702@viscovery.net>
Johannes Sixt schrieb:
> Rebase -i emitted used to write merge-recursive's conflict hints that said
> "modify/delete", "modify/rename", "content", etc. I think that's what you
> were looking for. But these hints have vanished since quite some time now.
> I haven't taken the time, yet, to track down when this happened and why.
Ok, I bisected it to 6eb1b437 (cherry-pick/revert: make direct internal
call to merge_tree(), 2008-09-02), which is part of a series around
merge-recursive: 1ad6d46..ed520a8
The commit message says: "One regression is that the status message is
lost as there is no way to flush them from outside the refactored library
code yet." But is it intentional that these messages were never recovered?
BTW, I miss the messages a lot, too, but I'm unfamiliar with the code in
question to try to do something about it.
-- Hannes
next prev parent reply other threads:[~2009-08-25 7:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-24 14:05 rebase hint unmerged file removed bill lam
2009-08-24 14:36 ` Jeff King
2009-08-25 4:42 ` bill lam
2009-08-24 14:42 ` Johannes Sixt
2009-08-25 7:35 ` Johannes Sixt [this message]
2009-08-25 8:11 ` Miklos Vajna
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=4A939455.5030908@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=cbill.lam@gmail.com \
--cc=git@vger.kernel.org \
--cc=vmiklos@frugalware.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.
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).