Show More
@@ -138,12 +138,12 b' Test revlog.optimize-delta-parent-choice' | |||||
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 |
|
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 |
General Comments 0
You need to be logged in to leave comments.
Login now