comparison tests/test-topic-flow-reject-untopiced.t @ 6775:6adcc5c7c1f1

branching: merge with stable
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 14 Apr 2024 00:41:49 -0300
parents 0592ae24c470
children 80d5e11713f5 2fbe91d762ef
comparison
equal deleted inserted replaced
6748:c6ff8ae8a752 6775:6adcc5c7c1f1
73 adding changesets 73 adding changesets
74 adding manifests 74 adding manifests
75 adding file changes 75 adding file changes
76 transaction abort! 76 transaction abort!
77 rollback completed 77 rollback completed
78 abort: rejecting draft changesets: 4e8b0e0237 78 abort: rejecting draft changesets: 4e8b0e0237c6
79 [255] 79 [255]
80 80
81 $ hg push ../server -f 81 $ hg push ../server -f
82 pushing to ../server 82 pushing to ../server
83 searching for changes 83 searching for changes
84 adding changesets 84 adding changesets
85 adding manifests 85 adding manifests
86 adding file changes 86 adding file changes
87 transaction abort! 87 transaction abort!
88 rollback completed 88 rollback completed
89 abort: rejecting draft changesets: 4e8b0e0237 89 abort: rejecting draft changesets: 4e8b0e0237c6
90 [255] 90 [255]
91 91
92 Grow the stack with more changesets having topic 92 Grow the stack with more changesets having topic
93 93
94 $ hg topic client 94 $ hg topic client
119 adding changesets 119 adding changesets
120 adding manifests 120 adding manifests
121 adding file changes 121 adding file changes
122 transaction abort! 122 transaction abort!
123 rollback completed 123 rollback completed
124 abort: rejecting draft changesets: 4e8b0e0237 124 abort: rejecting draft changesets: 4e8b0e0237c6
125 [255] 125 [255]
126 126
127 Testing case when both experimental.topic-mode.server and 127 Testing case when both experimental.topic-mode.server and
128 experimental.topic.publish-bare-branch are set 128 experimental.topic.publish-bare-branch are set
129 129
136 adding changesets 136 adding changesets
137 adding manifests 137 adding manifests
138 adding file changes 138 adding file changes
139 transaction abort! 139 transaction abort!
140 rollback completed 140 rollback completed
141 abort: rejecting draft changesets: 4e8b0e0237 141 abort: rejecting draft changesets: 4e8b0e0237c6
142 [255] 142 [255]
143 143
144 Turning the changeset public and testing push 144 Turning the changeset public and testing push
145 145
146 $ hg phase -r 3 -p 146 $ hg phase -r 3 -p