Mercurial > hg > mercurial-source
diff tests/test-phases.t @ 15820:2673006f7989
phases: fix phase synchronization on push
The bugs seemed to show up when element not in future common changeset should
hold new hold phase data.
The whole phase push machinery was rewritten in the process.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 04 Jan 2012 01:12:31 +0100 (2012-01-04) |
| parents | 33ca11b010e2 |
| children | a1f818a2b50d |
line wrap: on
line diff
--- a/tests/test-phases.t +++ b/tests/test-phases.t @@ -91,6 +91,10 @@ Test secret changeset are not pushed $ hg init ../push-dest + $ cat > ../push-dest/.hg/hgrc << EOF + > [phases] + > publish=False + > EOF $ hg push ../push-dest -f # force because we push multiple heads pushing to ../push-dest searching for changes @@ -100,18 +104,18 @@ added 5 changesets with 5 changes to 5 files (+1 heads) $ hglog 7 2 merge B' and E - 6 0 B' + 6 1 B' 5 2 H 4 2 E - 3 0 D - 2 0 C + 3 1 D + 2 1 C 1 0 B 0 0 A $ cd ../push-dest $ hglog - 4 0 B' - 3 0 D - 2 0 C + 4 1 B' + 3 1 D + 2 1 C 1 0 B 0 0 A $ cd .. @@ -142,10 +146,10 @@ $ hglog -r 'public()' 0 0 A 1 0 B - 2 0 C - 3 0 D - 6 0 B' $ hglog -r 'draft()' + 2 1 C + 3 1 D + 6 1 B' $ hglog -r 'secret()' 4 2 E 5 2 H