comparison tests/test-revset.t @ 25270:61b3529e2377

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 26 May 2015 07:44:37 -0500
parents 40a2cf1c765b 38117278f295
children 56eed3923dbc
comparison
equal deleted inserted replaced
25269:46bf4983cf31 25270:61b3529e2377
695 $ log 'ancestors(null)' 695 $ log 'ancestors(null)'
696 -1 696 -1
697 $ log 'reverse(null:)' | tail -2 697 $ log 'reverse(null:)' | tail -2
698 0 698 0
699 -1 699 -1
700 BROKEN: should be '-1'
700 $ log 'first(null:)' 701 $ log 'first(null:)'
701 -1 702 BROKEN: should be '-1'
702 $ log 'min(null:)' 703 $ log 'min(null:)'
703 -1
704 $ log 'tip:null and all()' | tail -2 704 $ log 'tip:null and all()' | tail -2
705 1 705 1
706 0 706 0
707 707
708 Test working-directory revision 708 Test working-directory revision
709 $ hg debugrevspec 'wdir()' 709 $ hg debugrevspec 'wdir()'
710 None 710 None
711 BROKEN: should include 'None'
711 $ hg debugrevspec 'tip or wdir()' 712 $ hg debugrevspec 'tip or wdir()'
712 9 713 9
713 None
714 $ hg debugrevspec '0:tip and wdir()' 714 $ hg debugrevspec '0:tip and wdir()'
715 715
716 $ log 'outgoing()' 716 $ log 'outgoing()'
717 8 717 8
718 9 718 9
1697 1697
1698 $ echo 'cat2n2($1, $2, $3, $4) = $1 ## $2 or $3 ## $4~2' >> .hg/hgrc 1698 $ echo 'cat2n2($1, $2, $3, $4) = $1 ## $2 or $3 ## $4~2' >> .hg/hgrc
1699 $ log "cat2n2(2785f5, 1eece5, 24286f, 4ae135)" 1699 $ log "cat2n2(2785f5, 1eece5, 24286f, 4ae135)"
1700 0 1700 0
1701 4 1701 4
1702
1703 $ cd ..
1704
1705 prepare repository that has "default" branches of multiple roots
1706
1707 $ hg init namedbranch
1708 $ cd namedbranch
1709
1710 $ echo default0 >> a
1711 $ hg ci -Aqm0
1712 $ echo default1 >> a
1713 $ hg ci -m1
1714
1715 $ hg branch -q stable
1716 $ echo stable2 >> a
1717 $ hg ci -m2
1718 $ echo stable3 >> a
1719 $ hg ci -m3
1720
1721 $ hg update -q null
1722 $ echo default4 >> a
1723 $ hg ci -Aqm4
1724 $ echo default5 >> a
1725 $ hg ci -m5
1726
1727 "null" revision belongs to "default" branch (issue4683)
1728
1729 $ log 'branch(null)'
1730 0
1731 1
1732 4
1733 5
1734
1735 "null" revision belongs to "default" branch, but it shouldn't appear in set
1736 unless explicitly specified (issue4682)
1737
1738 $ log 'children(branch(default))'
1739 1
1740 2
1741 5
1702 1742
1703 $ cd .. 1743 $ cd ..
1704 1744
1705 test author/desc/keyword in problematic encoding 1745 test author/desc/keyword in problematic encoding
1706 # unicode: cp932: 1746 # unicode: cp932: