comparison tests/test-obsolete-push.t @ 3818:f8677cb11dcb mercurial-4.3

test-compat: merge mercurial-4.4 into mercurial-4.3
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 08 Jun 2018 22:52:53 +0530
parents a867d59ea97a
children 27305068c5c9
comparison
equal deleted inserted replaced
3817:5ca297e78f2c 3818:f8677cb11dcb
24 $ echo c > c 24 $ echo c > c
25 $ hg ci -qAm C c 25 $ hg ci -qAm C c
26 $ hg phase --secret --force . 26 $ hg phase --secret --force .
27 $ hg prune 0 1 27 $ hg prune 0 1
28 2 changesets pruned 28 2 changesets pruned
29 1 new orphan changesets 29 1 new unstable changesets
30 $ glog --hidden 30 $ glog --hidden
31 @ 2:244232c2222a@default(secret) C 31 @ 2:244232c2222a@default(secret) C
32 | 32 |
33 | x 1:6c81ed0049f8@default(obsolete/draft) B 33 | x 1:6c81ed0049f8@default(obsolete/draft) B
34 |/ 34 |/
54 adding changesets 54 adding changesets
55 adding manifests 55 adding manifests
56 adding file changes 56 adding file changes
57 added 1 changesets with 1 changes to 1 files 57 added 1 changesets with 1 changes to 1 files
58 2 new obsolescence markers 58 2 new obsolescence markers
59 new changesets 1994f17a630e
60 updating to branch default 59 updating to branch default
61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
62 $ cd strict-publish-client 61 $ cd strict-publish-client
63 $ echo c > c 62 $ echo c > c
64 $ hg ci -qAm C c 63 $ hg ci -qAm C c