equal
deleted
inserted
replaced
355 $ hg push ../tmpf |
355 $ hg push ../tmpf |
356 pushing to ../tmpf |
356 pushing to ../tmpf |
357 searching for changes |
357 searching for changes |
358 no changes found |
358 no changes found |
359 [1] |
359 [1] |
|
360 |
|
361 Do not warn about new head when the new head is a successors of a remote one |
|
362 |
|
363 $ hg glog |
|
364 @ changeset: 5:6e572121998e |
|
365 | tag: tip |
|
366 | user: test |
|
367 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
368 | summary: add original_e |
|
369 | |
|
370 x changeset: 4:7c694bff0650 |
|
371 | user: test |
|
372 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
373 | summary: add original_d |
|
374 | |
|
375 o changeset: 3:5601fb93a350 |
|
376 | parent: 1:7c3bad9141dc |
|
377 | user: test |
|
378 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
379 | summary: add new_3_c |
|
380 | |
|
381 | o changeset: 2:245bde4270cd |
|
382 |/ user: test |
|
383 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
384 | summary: add original_c |
|
385 | |
|
386 o changeset: 1:7c3bad9141dc |
|
387 | user: test |
|
388 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
389 | summary: add b |
|
390 | |
|
391 o changeset: 0:1f0dee641bb7 |
|
392 user: test |
|
393 date: Thu Jan 01 00:00:00 1970 +0000 |
|
394 summary: add a |
|
395 |
|
396 $ hg up -q 'desc(new_3_c)' |
|
397 $ mkcommit obsolete_e |
|
398 created new head |
|
399 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` |
|
400 $ hg push ../tmpf |
|
401 pushing to ../tmpf |
|
402 searching for changes |
|
403 adding changesets |
|
404 adding manifests |
|
405 adding file changes |
|
406 added 1 changesets with 1 changes to 1 files (+1 heads) |