equal
deleted
inserted
replaced
279 searching for changes |
279 searching for changes |
280 adding changesets |
280 adding changesets |
281 adding manifests |
281 adding manifests |
282 adding file changes |
282 adding file changes |
283 added 1 changesets with 1 changes to 1 files (+1 heads) |
283 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
284 |
|
285 Old head is pruned without parent data and new unrelated head added |
|
286 =================================================================== |
|
287 |
|
288 setup |
|
289 |
|
290 $ cd .. |
|
291 $ rm -R remote local |
|
292 $ cp -R backup1 remote |
|
293 $ hg clone remote local -qr c70b08862e08 |
|
294 $ cd local |
|
295 $ hg up -q '.^' |
|
296 $ mkcommit new-unrelated |
|
297 created new head |
|
298 $ hg debugobsolete `getid old` |
|
299 $ hg log -G --hidden |
|
300 @ 350a93b716be (draft) add new-unrelated |
|
301 | |
|
302 | x c70b08862e08 (draft) add old |
|
303 |/ |
|
304 o b4952fcf48cf (public) add base |
|
305 |
|
306 |
|
307 $ hg push |
|
308 pushing to $TESTTMP/remote (glob) |
|
309 searching for changes |
|
310 abort: push creates new remote head 350a93b716be! |
|
311 (merge or see 'hg help push' for details about pushing new heads) |
|
312 [255] |