equal
deleted
inserted
replaced
67 $ hg pull -q ../server -r 4 |
67 $ hg pull -q ../server -r 4 |
68 $ hg debugindex x |
68 $ hg debugindex x |
69 rev offset length base linkrev nodeid p1 p2 |
69 rev offset length base linkrev nodeid p1 p2 |
70 0 0 3 0 1 1406e7411862 000000000000 000000000000 |
70 0 0 3 0 1 1406e7411862 000000000000 000000000000 |
71 |
71 |
|
72 $ cd .. |
|
73 |
|
74 Test format.aggressivemergedeltas |
|
75 |
|
76 $ hg init --config format.generaldelta=1 aggressive |
|
77 $ cd aggressive |
|
78 $ touch a b c d e |
|
79 $ hg commit -Aqm side1 |
|
80 $ hg up -q null |
|
81 $ touch x y |
|
82 $ hg commit -Aqm side2 |
|
83 |
|
84 - Verify non-aggressive merge uses p1 (commit 1) as delta parent |
|
85 $ hg merge -q 0 |
|
86 $ hg commit -q -m merge |
|
87 $ hg debugindex -m |
|
88 rev offset length delta linkrev nodeid p1 p2 |
|
89 0 0 59 -1 0 8dde941edb6e 000000000000 000000000000 |
|
90 1 59 59 -1 1 315c023f341d 000000000000 000000000000 |
|
91 2 118 65 1 2 2ab389a983eb 315c023f341d 8dde941edb6e |
|
92 |
|
93 $ hg strip -q -r . --config extensions.strip= |
|
94 |
|
95 - Verify aggressive merge uses p2 (commit 0) as delta parent |
|
96 $ hg up -q -C 1 |
|
97 $ hg merge -q 0 |
|
98 $ hg commit -q -m merge --config format.aggressivemergedeltas=True |
|
99 $ hg debugindex -m |
|
100 rev offset length delta linkrev nodeid p1 p2 |
|
101 0 0 59 -1 0 8dde941edb6e 000000000000 000000000000 |
|
102 1 59 59 -1 1 315c023f341d 000000000000 000000000000 |
|
103 2 118 62 0 2 2ab389a983eb 315c023f341d 8dde941edb6e |
|
104 |
|
105 $ cd .. |