--- a/tests/test-generaldelta.t Sun Aug 30 13:58:11 2015 -0700
+++ b/tests/test-generaldelta.t Sun Aug 30 14:03:32 2015 -0700
@@ -69,3 +69,37 @@
rev offset length base linkrev nodeid p1 p2
0 0 3 0 1 1406e7411862 000000000000 000000000000
+ $ cd ..
+
+Test format.aggressivemergedeltas
+
+ $ hg init --config format.generaldelta=1 aggressive
+ $ cd aggressive
+ $ touch a b c d e
+ $ hg commit -Aqm side1
+ $ hg up -q null
+ $ touch x y
+ $ hg commit -Aqm side2
+
+- Verify non-aggressive merge uses p1 (commit 1) as delta parent
+ $ hg merge -q 0
+ $ hg commit -q -m merge
+ $ hg debugindex -m
+ rev offset length delta linkrev nodeid p1 p2
+ 0 0 59 -1 0 8dde941edb6e 000000000000 000000000000
+ 1 59 59 -1 1 315c023f341d 000000000000 000000000000
+ 2 118 65 1 2 2ab389a983eb 315c023f341d 8dde941edb6e
+
+ $ hg strip -q -r . --config extensions.strip=
+
+- Verify aggressive merge uses p2 (commit 0) as delta parent
+ $ hg up -q -C 1
+ $ hg merge -q 0
+ $ hg commit -q -m merge --config format.aggressivemergedeltas=True
+ $ hg debugindex -m
+ rev offset length delta linkrev nodeid p1 p2
+ 0 0 59 -1 0 8dde941edb6e 000000000000 000000000000
+ 1 59 59 -1 1 315c023f341d 000000000000 000000000000
+ 2 118 62 0 2 2ab389a983eb 315c023f341d 8dde941edb6e
+
+ $ cd ..