Mercurial > hg
view tests/test-ancestor.py.out @ 20275:2123d27ff75d
backout: avoid update on simple case.
Before the changeset the backout process was:
1) go to <target>
2) revert to <target> parent
3) update back to changeset we came from
The two update steps can takes a very long time to move back and forth unrelated
file change between <target> and current working directory.
The new process is just merging current working directory with the parent of
<target> using <target> as ancestor. This give the very same result but skip
the two updates. On big repo with a lot of files and changes that save a lots of
time (x20 for one week window).
The "merge" version (hg backout --merge) is still done with upgrades. We could
imagine using in memory commit to speed it up but this is another fish.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Wed, 08 Jan 2014 14:53:46 -0800 |
parents | f7f8159caad3 |
children | 731b2a90983b |
line wrap: on
line source
% ancestors of [] and not of [1] [] % ancestors of [] and not of [] [] % ancestors of [12] and not of [] [0, 1, 2, 4, 6, 7, 9, 12] % ancestors of [0] and not of [0] [] % ancestors of [4, 5, 6] and not of [6, 5, 4] [] % ancestors of [-1] and not of [12] [] % ancestors of [12] and not of [-1] [0, 1, 2, 4, 6, 7, 9, 12] % ancestors of [12] and not of [9] [12] % ancestors of [9] and not of [12] [] % ancestors of [12, 9] and not of [7] [6, 9, 12] % ancestors of [7, 6] and not of [12] [] % ancestors of [10] and not of [11, 12] [5, 10] % ancestors of [11] and not of [10] [3, 7, 11] % ancestors of [11] and not of [10, 12] [3, 11] % ancestors of [12] and not of [10] [6, 7, 9, 12] % ancestors of [12] and not of [11] [6, 9, 12] % ancestors of [10, 11, 12] and not of [13] [0, 1, 2, 3, 4, 5, 6, 7, 9, 10, 11, 12] % ancestors of [13] and not of [10, 11, 12] [8, 13] % lazy ancestor set for [], stoprev = 0, inclusive = False [] % lazy ancestor set for [11, 13], stoprev = 0, inclusive = False [7, 8, 3, 4, 1, 0] % lazy ancestor set for [11, 13], stoprev = 0, inclusive = True [11, 13, 7, 8, 3, 4, 1, 0] % lazy ancestor set for [11, 13], stoprev = 6, inclusive = False [7, 8] % lazy ancestor set for [11, 13], stoprev = 6, inclusive = True [11, 13, 7, 8]