Mercurial > hg
view contrib/revsetbenchmarks.txt @ 23398:9da5a7413eb8
merge: use None as filename for base in 'both created' conflicts
Instead of using a file that we know is not in the common ancestor's
maniffest, let's use None. This is safe as the only place that cares
about the value (applyupdates) already checks if the item exists in
the ancestor.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 24 Nov 2014 16:17:02 -0800 |
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))::