view tests/test-censor2.t @ 52136:e68fe567a780 stable

evolution: stop wrongly flagging unrelated part of a split as divergent

Before this change, divergence introduced by successors of a split would "spill"
to other unrelated successors of the split that were not ambiguous.

This small changes fixes it.

Thanks goes to Manuel Jacobs for the discussion leading to this realization that
a new simple and correct definition could be found.

  $ cat >> $HGRCPATH <<EOF
  > [censor]
  > policy=ignore
  > EOF

  $ mkdir r
  $ cd r
  $ hg init
  $ echo secret > target
  $ hg commit -Am "secret"
  adding target
  $ touch bystander
  $ hg commit -Am "innocent"
  adding bystander
  $ echo erased-secret > target
  $ hg commit -m "erased secret"
  $ hg censor target --config extensions.censor= -r ".^^"
  checking for the censored content in 1 heads
  checking for the censored content in the working directory
  censoring 1 file revisions
  $ hg update ".^"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cat target
  $ hg update tip
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved