Thread (6 messages) flat view 6 messages, 4 authors, 2016-06-15

Re: rebase hint unmerged file removed

From: Johannes Sixt <hidden>
Date: 2016-06-15 22:47:18

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help