templatekw: merge, preferring the second implementation
authorBryan O'Sullivan <bryano@fb.com>
Tue, 14 Aug 2012 08:11:15 -0700
changeset 17358 2917f82f6040
parent 17357 bd605568c5a0 (current diff)
parent 17355 c25531ed58b0 (diff)
child 17359 d7753a0bb0cd
templatekw: merge, preferring the second implementation
mercurial/templatekw.py
tests/test-template-engine.t
--- a/tests/test-template-engine.t	Tue Jul 10 08:43:32 2012 -0700
+++ b/tests/test-template-engine.t	Tue Aug 14 08:11:15 2012 -0700
@@ -36,4 +36,12 @@
   $ hg log --style=./mymap
   0 97e5f848f0936960273bbf75be6388cd0350a32b test
 
+  $ cat > changeset.txt << EOF
+  > {{p1rev}} {{p1node}} {{p2rev}} {{p2node}}
+  > EOF
+  $ hg ci -Ama
+  $ hg log --style=./mymap
+  0 97e5f848f0936960273bbf75be6388cd0350a32b -1 0000000000000000000000000000000000000000
+  -1 0000000000000000000000000000000000000000 -1 0000000000000000000000000000000000000000
+
   $ cd ..