Mercurial > hg-stable
diff tests/test-obsolete-checkheads.t @ 32009:c6cb21ddf74a
checkheads: upgrade the obsolescence postprocessing logic (issue4354)
The previous logic had many shortcoming (eg: looking at the head only, not
handling prune, etc...), the new logic use a more robust approach:
For each head, we check if after the push all changesets exclusive to this heads
will be obsolete. If they are, the branch considered be "replaced".
To check if a changeset will be obsolete, we simply checks:
* the changeset phase
* the existence of a marker relevant to the "pushed set" that affects the
changesets..
This fixes two major issues of the previous algorithm:
* branch partially rewritten (eg: head but not root) are no longer detected as
replaced,
* Prune are now properly handled.
(This implementation was introduction in the evolve extension, version 6.0.0.)
This new algorithm has an extended number of tests, a basic one is provided
in this patch. The others will be introduced in their own changeset for clarity.
In addition, we stop trying to process heads unknown locally, we do not have
enough data to take an informed decision so we should stop pretending we do.
This reflect a test that is now update.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Sat, 15 Apr 2017 02:55:18 +0200 |
parents | c059286a0f9c |
children | c52728b383b4 |
line wrap: on
line diff
--- a/tests/test-obsolete-checkheads.t Sun Apr 16 00:37:31 2017 -0400 +++ b/tests/test-obsolete-checkheads.t Sat Apr 15 02:55:18 2017 +0200 @@ -254,9 +254,27 @@ @ b4952fcf48cf (public) add base -Push should not complain about new heads. +We do not have enought data to take the right decision, we should fail + + $ hg push + pushing to $TESTTMP/remote (glob) + searching for changes + remote has heads on branch 'default' that are not known locally: c70b08862e08 + abort: push creates new remote head 71e3228bffe1! + (pull and merge or see 'hg help push' for details about pushing new heads) + [255] - $ hg push --traceback +Pulling the missing data makes it work + + $ hg pull + pulling from $TESTTMP/remote (glob) + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) + (run 'hg heads' to see heads) + $ hg push pushing to $TESTTMP/remote (glob) searching for changes adding changesets