equal
deleted
inserted
replaced
205 searching for changes |
205 searching for changes |
206 abort: push includes orphan changeset: c09d8ab29fda! |
206 abort: push includes orphan changeset: c09d8ab29fda! |
207 [255] |
207 [255] |
208 |
208 |
209 $ cd ../.. |
209 $ cd ../.. |
|
210 |
|
211 Orphan from superseding |
|
212 ----------------------- |
|
213 |
|
214 Make sure the only difference is phase: |
|
215 |
|
216 $ cd check-superseded/client |
|
217 $ hg push --force --rev 'not desc("unrelated")' |
|
218 pushing to $TESTTMP/check-superseded/server |
|
219 searching for changes |
|
220 adding changesets |
|
221 adding manifests |
|
222 adding file changes |
|
223 added 1 changesets with 0 changes to 0 files (+1 heads) |
|
224 1 new obsolescence markers |
|
225 obsoleted 1 changesets |
|
226 1 new orphan changesets |
|
227 |
|
228 Check something prevents a silent publication of the obsolete changeset |
|
229 |
|
230 $ hg push --publish --new-branch |
|
231 pushing to $TESTTMP/check-superseded/server |
|
232 searching for changes |
|
233 abort: push includes orphan changeset: c09d8ab29fda! |
|
234 [255] |
|
235 |
|
236 $ cd ../.. |