view tests/test-addremove-similar.out @ 10505:b3311e26f94f stable

merge: fix --preview to show all nodes that will be merged (issue2043).

Formerly, it omitted nodes that were not descendants of the least
common ancestor of the two merge parents, even though those nodes
contribute to the merge.  The new algorithm uses revlog.findmissing()
instead of ancestor() + nodesbetween().

adding empty-file
adding large-file
adding another-file
removing empty-file
removing large-file
recording removal of large-file as rename to another-file (99% similar)
% comparing two empty files caused ZeroDivisionError in the past
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding another-empty-file
removing empty-file
adding large-file
adding tiny-file
removing large-file
adding small-file
removing tiny-file
recording removal of tiny-file as rename to small-file (82% similar)
% should all fail
abort: similarity must be a number
abort: similarity must be between 0 and 100
abort: similarity must be between 0 and 100
% issue 1527
removing d/a
adding d/b
recording removal of d/a as rename to d/b (100% similar)
r   0          0 1970-01-01 00:00:00 d/a
a   0         -1 unset               d/b
copy: d/a -> d/b
% no copies found here (since the target isn't in d
removing d/b
% copies here
adding c
recording removal of d/a as rename to c (100% similar)