Mercurial > hg
view tests/test-revset-dirstate-parents.t @ 43278:2c70dd03b743
py3: fix sorting of obsolete markers during push
This fixes similar errors as in 01e8eefd9434:
TypeError: '<' not supported between instances of 'NoneType' and 'tuple'
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Thu, 17 Oct 2019 13:34:21 +0200 |
parents | 7bbc4e113e5f |
children |
line wrap: on
line source
$ HGENCODING=utf-8 $ export HGENCODING $ try() { > hg debugrevspec --debug $@ > } $ log() { > hg log --template '{rev}\n' -r "$1" > } $ hg init repo $ cd repo $ try 'p1()' (func (symbol 'p1') None) * set: <baseset []> $ try 'p2()' (func (symbol 'p2') None) * set: <baseset []> $ try 'parents()' (func (symbol 'parents') None) * set: <baseset+ []> null revision $ log 'p1()' $ log 'p2()' $ log 'parents()' working dir with a single parent $ echo a > a $ hg ci -Aqm0 $ log 'p1()' 0 $ log 'tag() and p1()' $ log 'p2()' $ log 'parents()' 0 $ log 'tag() and parents()' merge in progress $ echo b > b $ hg ci -Aqm1 $ hg up -q 0 $ echo c > c $ hg ci -Aqm2 $ hg merge -q $ log 'p1()' 2 $ log 'p2()' 1 $ log 'tag() and p2()' $ log 'parents()' 1 2 $ cd ..