comparison tests/test-obsolete-push.t @ 1748:83cf722eafc3 mercurial-3.7

merge with future 5.5 No extra new change are needed from the one needed from the 3.8 branch and previous version.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 28 Oct 2016 16:26:25 +0200
parents b0a67ebc464e
children ec04eb4d2c6e
comparison
equal deleted inserted replaced
1705:db60fb88b4b5 1748:83cf722eafc3
27 $ hg phase --secret --force . 27 $ hg phase --secret --force .
28 $ hg prune 0 1 28 $ hg prune 0 1
29 2 changesets pruned 29 2 changesets pruned
30 1 new unstable changesets 30 1 new unstable changesets
31 $ glog --hidden 31 $ glog --hidden
32 @ 2:244232c2222a@default(unstable/secret) C 32 @ 2:244232c2222a@default(/secret) C
33 | 33 |
34 | x 1:6c81ed0049f8@default(extinct/draft) B 34 | x 1:6c81ed0049f8@default(obsolete/draft) B
35 |/ 35 |/
36 x 0:1994f17a630e@default(suspended/draft) A 36 x 0:1994f17a630e@default(obsolete/draft) A
37 37
38 $ hg init ../clone 38 $ hg init ../clone
39 $ cat > ../clone/.hg/hgrc <<EOF 39 $ cat > ../clone/.hg/hgrc <<EOF
40 > [phases] 40 > [phases]
41 > publish = false 41 > publish = false
42 > EOF 42 > EOF
43 $ hg outgoing ../clone --template "$template" 43 $ hg outgoing ../clone --template "$template"
44 comparing with ../clone 44 comparing with ../clone
45 searching for changes 45 searching for changes
46 0:1994f17a630e@default(suspended/draft) A 46 0:1994f17a630e@default(obsolete/draft) A