annotate tests/test-dispatch.py.out @ 18895:ed676ed67a5c

manifestmerge: handle workdir removed, remote removed with flags

This can happen when a file with flags is removed or deleted in the working
directory and also not present in m2. The obvious solution is to add a
__delitem__ override to manifestdict that removes the file from flags if
necessary, but that has a significant performance cost in some cases, e.g.
hg status --rev rev1 --rev rev2 <file>.

running: init test1
result: None
running: add foo
result: 0
running: commit -m commit1 -d 2000-01-01 foo
result: None
running: commit -m commit2 -d 2000-01-02 foo
result: None
running: log -r 0
changeset:   0:0e4634943879
user:        test
date:        Sat Jan 01 00:00:00 2000 +0000
summary:     commit1

result: None
running: log -r tip
changeset:   1:45589e459b2e
tag:         tip
user:        test
date:        Sun Jan 02 00:00:00 2000 +0000
summary:     commit2

result: None