comparison tests/test-topic-push.t @ 2982:fef934b7ed86

topic: add a --topic option to "push" command This is symmetrical with --bookmark or --branch; it selects changesets in specified topic as revisions to push.
author Denis Laxalde <denis.laxalde@logilab.fr>
date Fri, 22 Sep 2017 13:43:38 +0200
parents 06844693bb21
children c0de0010ec30
comparison
equal deleted inserted replaced
2981:86be70ae38b9 2982:fef934b7ed86
155 |/ 155 |/
156 | o 1 default public CB 156 | o 1 default public CB
157 |/ 157 |/
158 o 0 default public CA 158 o 0 default public CA
159 159
160 push --topic
161
162 $ hg log -G -R $TESTTMP/draft
163 o 3 default babar draft CD
164 |
165 | o 2 mountain public CC
166 |/
167 | o 1 default public CB
168 |/
169 o 0 default public CA
170
171 $ echo bbb >> aaa
172 $ hg commit -m "C'A"
173 $ hg up 1
174 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
175 $ hg topic --clear
176 $ echo bbb >> bbb
177 $ hg commit -m "C'B"
178 $ hg log -G
179 @ 6 default draft C'B
180 |
181 | o 5 default babar draft C'A
182 | |
183 | o 4 default babar draft CD
184 | |
185 | | o 3 mountain public CC
186 | |/
187 o | 1 default public CB
188 |/
189 o 0 default public CA
190
191 $ hg push draft --topic babar
192 pushing to $TESTTMP/draft
193 searching for changes
194 adding changesets
195 adding manifests
196 adding file changes
197 added 1 changesets with 1 changes to 1 files
198 $ hg log -G -R $TESTTMP/draft
199 o 4 default babar draft C'A
200 |
201 o 3 default babar draft CD
202 |
203 | o 2 mountain public CC
204 |/
205 | o 1 default public CB
206 |/
207 o 0 default public CA
208
209 $ hg strip --config extensions.strip= --no-backup -r 5: --quiet
210 $ hg strip --config extensions.strip= -R $TESTTMP/draft --no-backup -r 4: --quiet
160 211
161 Pushing a new topic to a publishing server should be seen as a new head 212 Pushing a new topic to a publishing server should be seen as a new head
162 213
163 $ hg push 214 $ hg push
164 pushing to $TESTTMP/main (glob) 215 pushing to $TESTTMP/main (glob)