Mercurial > hg
view contrib/base-revsets.txt @ 45761:341e014fe0fb stable
repoview: only pin obsolete wdir parents while there are unresolved conflicts
I noticed after doing an update from an obsolete revision with a dirty wdir that
the obsolete commit stayed visible for no obvious reason. It was decided in
85b03b1e4715 not to clear mergestate once all of the conflicts were resolved, in
order to allow re-resolving. Since the point of pinning the obsolete parents
was to allow resolving in the first place (aaeccdb6e654), it makes sense to also
gate it on whether or not there are any remaining files to resolve. This might
result in pinning again if files are marked unresolved again, but that seems
reasonable, given that it still solves the original issue.
Note that this isn't purely cosmetic- pushing with a pinned obsolete revision is
likely to cause complaints about pushing multiple heads or other unexpected
errors. So the faster it comes out of that state, the better.
Differential Revision: https://phab.mercurial-scm.org/D9248
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 23 Oct 2020 22:20:08 -0400 |
parents | a4483e380c3e |
children | d4ba4d51f85f |
line wrap: on
line source
# Base Revsets to be used with revsetbenchmarks.py script # # The goal of this file is to gather a limited amount of revsets that allow a # good coverage of the internal revsets mechanisms. Revsets included should not # be selected for their individual implementation, but for what they reveal of # the internal implementation of smartsets classes (and their interactions). # # Use and update this file when you change internal implementation of these # smartsets classes. Please include a comment explaining what each of your # addition is testing. Also check if your changes to the smartset class makes # some of the tests inadequate and replace them with a new one testing the same # behavior. # # If you want to benchmark revsets predicate itself, check 'all-revsets.txt'. # # The current content of this file is currently likely not reaching this goal # entirely, feel free, to audit its content and comment on each revset to # highlight what internal mechanisms they test. 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 0:: # those two `roots(...)` inputs are close to what phase movement use. roots((tip~100::) - (tip~100::tip)) roots((0::) - (0::tip)) 42:68 and roots(42:tip) ::p1(p1(tip)):: public() :10000 and public() draft() :10000 and draft() 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)):: heads(commonancestors(last(head(), 2))) heads(-10000:-1) roots(-10000:-1) only(max(head()), min(head()))