Mercurial > hg
view tests/test-simple-update.t @ 25115:5548f558db3d
revset: fix iteration over ordered addset composed of non-ordered operands
Before this change, doing ordered iteration over an 'addset' object composed of
operands without fastasc or fastdesc method could result in duplicated entries.
This was the result of applying '_iterordered' on an unordered set.
We fix it by ensuring we iterate over the set in a sorted order. Using the fast
iterator when it exists on any operand. We kill the '_iterator' method in the
process because it did not make a lot of sense independently.
Thanks goes to Yuya Nishihara for reporting the issue and analysing the cause.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 15 May 2015 00:25:43 -0700 |
parents | f2719b387380 |
children | 92bca12328d1 |
line wrap: on
line source
$ hg init test $ cd test $ echo foo>foo $ hg addremove adding foo $ hg commit -m "1" $ hg verify checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions $ hg clone . ../branch updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd ../branch $ hg co 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo bar>>foo $ hg commit -m "2" $ cd ../test $ hg pull ../branch pulling from ../branch searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) $ hg verify checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 2 changesets, 2 total revisions $ hg co 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat foo foo bar $ hg manifest --debug 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo update to rev 0 with a date $ hg upd -d foo 0 abort: you can't specify a revision and a date [255] $ cd ..