Mercurial > hg
changeset 15951:bd84fc0b5f64 stable
phases: properly register excluded changeset when revision are specified
There was no other drawback than a bad UI message for now.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 20 Jan 2012 00:27:11 +0100 |
| parents | 27f56b73522c |
| children | ec8a9e06cf05 |
| files | mercurial/discovery.py tests/test-mq-safety.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/discovery.py Fri Jan 20 14:19:13 2012 -0600 +++ b/mercurial/discovery.py Fri Jan 20 00:27:11 2012 +0100 @@ -116,7 +116,7 @@ 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)
--- a/tests/test-mq-safety.t Fri Jan 20 14:19:13 2012 -0600 +++ b/tests/test-mq-safety.t Fri Jan 20 00:27:11 2012 +0100 @@ -171,7 +171,7 @@ $ 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