comparison tests/test-obsolete-push.t @ 2434:37deace44b36 mercurial-3.8

merge with future 6.2.0 No extra change were needed compared to 3.9.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 18 May 2017 23:55:02 +0200
parents 979a8ea17e1e
children b3dac812fb2a
comparison
equal deleted inserted replaced
2433:fd24f1c7accd 2434:37deace44b36
4 > [extensions] 4 > [extensions]
5 > hgext.graphlog= 5 > hgext.graphlog=
6 > EOF 6 > EOF
7 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH 7 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
8 8
9 $ template='{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' 9 $ template='{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n'
10 $ glog() { 10 $ glog() {
11 > hg glog --template "$template" "$@" 11 > hg glog --template "$template" "$@"
12 > } 12 > }
13 13
14 Test outgoing, common A is suspended, B unstable and C secret, remote 14 Test outgoing, common A is suspended, B unstable and C secret, remote
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(secret) C 32 @ 2:244232c2222a@default(/secret) C
33 | 33 |
34 | x 1:6c81ed0049f8@default(obsolete/draft) B 34 | x 1:6c81ed0049f8@default(obsolete/draft) B
35 |/ 35 |/
36 x 0:1994f17a630e@default(obsolete/draft) A 36 x 0:1994f17a630e@default(obsolete/draft) A
37 37