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

Re: [RFH] filter-branch: ancestor detection weirdness

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:45:07

Hi,

On Fri, 8 Aug 2008, Thomas Rast wrote:
I think a more careful use of rev-list -1 is actually a correct and easy 
way to figure out an ancestor.
I have not looked at your patch closely, or at your explanation, but I am 
really certain that every attempt to replace the --boundary with a -1 must 
fail.

Let me show you why I think that.  Just look at this history:

A - B - C
  /
D

Where all commits except B touch the inside directory.  Two options:

- you make C a merge (that's what I tried with --boundary), or

- you record B, and C as a commit that does not introduce changes, which 
  is obviously wrong, or

- you record B as a merge, with identical content as A and D, which is 
  pretty tricky (which is why I avoided it).

Anyway, I am really swamped in work, and will not have time to review big 
changes or explanations.  Besides, filter-branch is no fun.  
rewrite-commits would have been, but Sven chickened out.

Ciao,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help