changeset 25120 | a7701001c829 |
parent 25111 | 1ef96a3b8b89 |
child 25382 | 6084926366b9 |
--- a/tests/test-phases.t Sun Apr 12 23:51:06 2015 -0700 +++ b/tests/test-phases.t Fri May 15 09:46:21 2015 +0200 @@ -36,6 +36,8 @@ Draft commit are properly created over public one: $ hg phase --public . + $ hg phase + 1: public $ hglog 1 0 B 0 0 A @@ -86,6 +88,9 @@ $ hg merge 4 # E 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) + $ hg phase + 6: draft + 4: secret $ hg ci -m "merge B' and E" $ hglog 7 2 merge B' and E