Mercurial > hg
comparison tests/test-generaldelta.t @ 51500:f3e9d1df879b stable
test-general-delta: actually test optimize-delta-parent-choice=no
Since the configuration was not explicit, the case stopped testing what it
intended to test when the default value changed.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 11 Mar 2024 11:09:29 +0100 |
| parents | 7083b33a2699 |
| children | e5b28637f4ca |
comparison
equal
deleted
inserted
replaced
| 51499:8b77ad54d67a | 51500:f3e9d1df879b |
|---|---|
| 136 $ touch x y | 136 $ touch x y |
| 137 $ hg commit -Aqm side2 | 137 $ hg commit -Aqm side2 |
| 138 | 138 |
| 139 - Verify non-aggressive merge uses p1 (commit 1) as delta parent | 139 - Verify non-aggressive merge uses p1 (commit 1) as delta parent |
| 140 $ hg merge -q 0 | 140 $ hg merge -q 0 |
| 141 $ hg commit -q -m merge | 141 $ hg commit -q -m merge --config storage.revlog.optimize-delta-parent-choice=no |
| 142 $ hg debugdeltachain -m | 142 $ hg debugdeltachain -m |
| 143 rev p1 p2 chain# chainlen prev delta | 143 rev p1 p2 chain# chainlen prev delta |
| 144 0 -1 -1 1 1 -1 base | 144 0 -1 -1 1 1 -1 base |
| 145 1 -1 -1 1 2 0 prev | 145 1 -1 -1 1 2 0 prev |
| 146 2 1 0 1 2 0 p2 | 146 2 1 0 1 3 1 p1 |
| 147 | 147 |
| 148 $ hg strip -q -r . --config extensions.strip= | 148 $ hg strip -q -r . --config extensions.strip= |
| 149 | 149 |
| 150 - Verify aggressive merge uses p2 (commit 0) as delta parent | 150 - Verify aggressive merge uses p2 (commit 0) as delta parent |
| 151 $ hg up -q -C 1 | 151 $ hg up -q -C 1 |