equal
deleted
inserted
replaced
116 0 1 1 -1 base 104 135 104 0.77037 104 0 0.00000 |
116 0 1 1 -1 base 104 135 104 0.77037 104 0 0.00000 |
117 1 1 2 0 p1 57 135 161 1.19259 161 0 0.00000 |
117 1 1 2 0 p1 57 135 161 1.19259 161 0 0.00000 |
118 2 1 2 0 p1 57 135 161 1.19259 218 57 0.35404 |
118 2 1 2 0 p1 57 135 161 1.19259 218 57 0.35404 |
119 3 1 2 0 p1 57 135 161 1.19259 275 114 0.70807 |
119 3 1 2 0 p1 57 135 161 1.19259 275 114 0.70807 |
120 |
120 |
121 Test format.aggressivemergedeltas |
121 Test revlog.optimize-delta-parent-choice |
122 |
122 |
123 $ hg init --config format.generaldelta=1 aggressive |
123 $ hg init --config format.generaldelta=1 aggressive |
124 $ cd aggressive |
124 $ cd aggressive |
125 $ cat << EOF >> .hg/hgrc |
125 $ cat << EOF >> .hg/hgrc |
126 > [format] |
126 > [format] |
144 $ hg strip -q -r . --config extensions.strip= |
144 $ hg strip -q -r . --config extensions.strip= |
145 |
145 |
146 - Verify aggressive merge uses p2 (commit 0) as delta parent |
146 - Verify aggressive merge uses p2 (commit 0) as delta parent |
147 $ hg up -q -C 1 |
147 $ hg up -q -C 1 |
148 $ hg merge -q 0 |
148 $ hg merge -q 0 |
149 $ hg commit -q -m merge --config format.aggressivemergedeltas=True |
149 $ hg commit -q -m merge --config revlog.optimize-delta-parent-choice=yes |
150 $ hg debugdeltachain -m |
150 $ hg debugdeltachain -m |
151 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio |
151 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio |
152 0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000 |
152 0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000 |
153 1 1 2 0 prev 61 86 120 1.39535 120 0 0.00000 |
153 1 1 2 0 prev 61 86 120 1.39535 120 0 0.00000 |
154 2 1 2 0 p2 62 301 121 0.40199 182 61 0.50413 |
154 2 1 2 0 p2 62 301 121 0.40199 182 61 0.50413 |