# HG changeset patch # User Pierre-Yves David # Date 2012-01-19 23:27:11 # Node ID bd84fc0b5f64e31c7e79eda59d2ede1fd135ba9d # Parent 27f56b73522c887f8b5242918427c5b9692fc175 phases: properly register excluded changeset when revision are specified There was no other drawback than a bad UI message for now. diff --git a/mercurial/discovery.py b/mercurial/discovery.py --- a/mercurial/discovery.py +++ b/mercurial/discovery.py @@ -116,7 +116,7 @@ def findcommonoutgoing(repo, other, only sets = repo.changelog.findcommonmissing(og.commonheads, onlyheads) og._common, allmissing = sets og._missing = missing = [] - og._excluded = excluded = [] + og.excluded = excluded = [] for node in allmissing: if repo[node].phase() >= phases.secret: excluded.append(node) diff --git a/tests/test-mq-safety.t b/tests/test-mq-safety.t --- a/tests/test-mq-safety.t +++ b/tests/test-mq-safety.t @@ -171,7 +171,7 @@ Pushing applied patch with --force $ hg push --force -r default ../forcepush2 pushing to ../forcepush2 searching for changes - no changes found + no changes to push but 1 secret changesets $ hg phase -d 'mq()' $ hg push --force -r default ../forcepush2 pushing to ../forcepush2