view contrib/revsetbenchmarks.txt @ 23418:c90d9ab6777a stable

tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged' Use suffix -same for cases where file changed but content is the same - that is the case where manifestmerge doesn't detect that a file is unchanged. (The suffix -id is already used for cases where the file didn't change - that is the trivial case where manifestmerge detects that the file is unchanged.) These new tests are good but the results are bad. There shouldn't be any merge conflicts or prompts when one side didn't change.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 01 Dec 2014 02:11:17 +0100
parents ace8320156ef
children e5f166961123
line wrap: on
line source

all()
draft()
::tip
draft() and ::tip
::tip and draft()
0::tip
roots(0::tip)
author(lmoscovicz)
author(mpm)
author(lmoscovicz) or author(mpm)
author(mpm) or author(lmoscovicz)
tip:0
max(tip:0)
min(0:tip)
0::
min(0::)
# those two `roots(...)` inputs are close to what phase movement use.
roots((tip~100::) - (tip~100::tip))
roots((0::) - (0::tip))
::p1(p1(tip))::
public()
:10000 and public()
draft()
:10000 and draft()
max(::(tip~20) - obsolete())
roots((0:tip)::)
(not public() - obsolete())
(_intlist('20000\x0020001')) and merge()
parents(20000)
(20000::) - (20000)
# The one below is used by rebase
(children(ancestor(tip~5, tip)) and ::(tip~5))::