Mercurial > evolve
diff tests/test-topic-flow-publish-bare.t @ 6381:60daa7887c49
branching: merge test changes from before topic namespaces
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Tue, 31 Jan 2023 13:33:28 +0400 |
parents | a2855aff1268 eac8880c145e |
children | 567cc86f2d01 445240ccb701 |
line wrap: on
line diff
--- a/tests/test-topic-flow-publish-bare.t Mon Jan 09 19:44:49 2023 +0400 +++ b/tests/test-topic-flow-publish-bare.t Tue Jan 31 13:33:28 2023 +0400 @@ -95,8 +95,8 @@ $ hg update 'desc("ROOT")' 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - $ hg branch branchA - marked working directory as branch branchA + $ hg branch double//slash + marked working directory as branch double//slash (branches are permanent and global, did you want a bookmark?) $ mkcommit c_aE0 $ hg push --new-branch @@ -108,7 +108,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) $ hg tgl 'all()' - @ 5:0db08e758601 c_aE0 public branchA + @ 5:ffb83c22f2ce c_aE0 public double//slash | | o 4:9bf953aa81f6 c_dD0 public default | | @@ -149,7 +149,7 @@ |/ o 1:134bc3852ad2 c_dA0 public default | - | o 5:0db08e758601 c_aE0 public branchA + | o 5:ffb83c22f2ce c_aE0 public double//slash |/ o 0:ea207398892e ROOT public default @@ -188,7 +188,7 @@ |/ o 1:134bc3852ad2 c_dA0 public default | - | o 5:0db08e758601 c_aE0 public branchA + | o 5:ffb83c22f2ce c_aE0 public double//slash |/ o 0:ea207398892e ROOT public default @@ -215,9 +215,9 @@ adding file changes added 3 changesets with 3 changes to 3 files $ hg tgl 'all()' - @ 11:b0a00ebdfd24 c_aK0 public branchA + @ 11:a6836f5ce4fe c_aK0 public double//slash | - o 5:0db08e758601 c_aE0 public branchA + o 5:ffb83c22f2ce c_aE0 public double//slash | | o 10:abb5c84eb9e9 c_dJ0 draft default bar | | @@ -278,9 +278,9 @@ |/ o 1:134bc3852ad2 c_dA0 public default | - | o 11:b0a00ebdfd24 c_aK0 public branchA + | o 11:a6836f5ce4fe c_aK0 public double//slash | | - | o 5:0db08e758601 c_aE0 public branchA + | o 5:ffb83c22f2ce c_aE0 public double//slash |/ o 0:ea207398892e ROOT public default @@ -305,9 +305,9 @@ |/ @ 1:134bc3852ad2 c_dA0 public default | - | o 11:b0a00ebdfd24 c_aK0 public branchA + | o 11:a6836f5ce4fe c_aK0 public double//slash | | - | o 5:0db08e758601 c_aE0 public branchA + | o 5:ffb83c22f2ce c_aE0 public double//slash |/ o 0:ea207398892e ROOT public default @@ -342,7 +342,7 @@ Checking the option to prevent automatic publishing =================================================== - $ hg up branchA + $ hg up double//slash// 2 files updated, 0 files merged, 5 files removed, 0 files unresolved Making sure the topic-publishing mode is announced as a capability