Comment 10 for bug 1072513

Revision history for this message
Matthew Fuller (fullermd) wrote :

Recap based on new output:

The full set of revs touching foo (from looking at the log -v above) are
    1.2.2
  3
  2
    1.1.1

However, with the script run, only
    1.2.2
shows up (with log -v for FILE, with log with or without -v for DIR).

Taking out _any_ one of the [1]-marked "Nada" commits yields:
    1.2.2
  3

Any two of the [1]'s:
    1.2.2
  3
  2

And any 3 or more:
    1.2.2
  3
  2
    1.1.1

(though watch out for renumberings, depending on which you take out) Doesn't matter which [1]'s you take out; the revs in log are always revealed in that specific order.

--------------------------------------------------

An extra note I came across: See the merge of A into C at [4]. I get the same results whether I merge just rev 2 (the merge of B, which adds /foo), merge rev 3 (the edit of foo), or merge up through rev 4 (the --unchanged "Nada"); only that merge (1.2.2) shows up.

Note however that the presence of the rev 4 "Nada" (marked [4.1] in the script) is required whether or not it's part of the merge into C; taking it out still triggers the first step of "more revs showing up" by unveiling 3 in the log output.