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

Re: Last mile for 1.0 again

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:01

quoted
quoted
quoted
quoted
"DB" == Daniel Barkalow [off-list ref] writes:
DB> [perl script]
quoted
How does this work, and what do we do about merges?
DB> I've got that part, but I'm not clear on how the rename/copy and complete
DB> rewrite stuff works.

Rename/copy is simply about what files to use when comparing
between two trees.  If you are tracking file F and find that a
commit created that file by renaming what was originally G, then
you compare old G and this F and assign blame for common lines
to the ancestor of that commit (that had those lines in G), and
take responsibility of the rest yourself (or assign blame for
them to other parents).

Rewrite is easier.  If diff-tree -B says it is a complete
rewrite, instead of assigning blame for lines that you are the
current suspect to any of your parents, you take blame for all
of them yourself, without comparing the file with the parent to
assign blame line-by-line.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help