# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1399039450 14400
# Node ID cdad3b3e4a09957e06211ce9d562a2674e5d74b6
# Parent  a22d4972e01fd3478ac5b4f4fae810591ff0049d# Parent  e4b7374793029823dfe7b960034caa2ff10e1b4a
Merge with stable.

diff --git a/.hgsigs b/.hgsigs
new file mode 100644
--- /dev/null
+++ b/.hgsigs
@@ -0,0 +1,1 @@
+41ff2014d125cfe6eda39a79dc1c7ca9c99bf785 0 iQIcBAABAgAGBQJTY6GOAAoJELnJ3IJKpb3VrTcP/iIvysZP7BMyBW6QfAZMl9vRz06BlOgGIapNFcI2E12yC6j8oADymz2QZCtj21YyyuxIeuPLya5LQ1OoGHsZk/iW700UxUdrUzW3QbKiTfKrNXN915aRE1rYznzetgQc+xqGV4Hk7P5GarAfBcZtCVtc7/Gmo9AMkU1QbLzhwDGMLLUDt1Gsu9Vn3JugVN6O10NqxxGvU18ahVMsy+qyaJBZ5fJUKnBAmwHa3DCP5DRfDNKUaAl7xOK09gvRi6h6dPl8HPrx6tN3wkQ0QRB6kD06yrJejnQ7eM/1fxLNovZ0MZe2+bHMeXWnzGseQsrlvZSi3GWch4xSW+Tqa/pRo0qbbQ8Tq3Hj7J2Ip482nEwzEZZiWcw/1vAIraYkinGuTcw0Kq+IsKh8zBRN5jiyq3NNQYXraC93KL9/raVbssPG6KAP7LBiN0cYM51T3lL1ER1/oMJJfdX4OWn6dCRptlqfwhW9hxK/R+dbm2lOcT6EENtYp4nq5amqym0i4zx/bAJmw4mpNMEmZdAIBCgjxxb01ez1IQFzvg+/+DIr62n+YGlhsYVJTDRVAdwaLXQKnSo7gIowpsWU9WRejxaISuVr6aQbuMtbtZIjqUFSIC6UR1d9GQdkiXWv+tCP29UHqTV+81BaFAyTe6s4zc5IhEZudwdN6f1bBtYD3BN3vX9M
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -10,3 +10,4 @@ 07234759a3f750029ccaa001837d42fa12dd33ee
 77b22e5b4ea6c248e079afd0f1e544cb5690ce20 1.5
 d0f3a5c2cb56ce65d9ef1c611c8bfbebdc3bef34 1.5.1
 7d47a0f731354505ed9ae8d60d2a6996e8c3294f 1.6
+8caf1226adecb322e90ddb3817c604fa2fe8a66d 1.6.1
diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py
diff --git a/tests/test_template_keywords.py b/tests/test_template_keywords.py
--- a/tests/test_template_keywords.py
+++ b/tests/test_template_keywords.py
@@ -30,24 +30,27 @@ class CapturingUI(ui.ui):
 class TestLogKeywords(test_util.TestBase):
     @test_util.requiresmodule(templatekw)
     def test_svn_keywords(self):
-        defaults = {'date': None, 'rev': None, 'user': None}
+        defaults = {'date': None, 'rev': None, 'user': None, 'graph': True}
         repo = self._load_fixture_and_fetch('two_revs.svndump')
 
         # we want one commit that isn't from Subversion
         self.commitchanges([('foo', 'foo', 'frobnicate\n')])
 
         ui = CapturingUI()
-        commands.log(ui, repo, template='{rev}:{svnrev} ', **defaults)
-        self.assertEqual(ui._output, '0:2 1:3 2: ')
-        ui = CapturingUI()
-        commands.log(ui, repo, template='{rev}:{svnpath} ', **defaults)
-        self.assertEqual(ui._output, '0:/trunk 1:/trunk 2: ')
-        ui = CapturingUI()
-        commands.log(ui, repo, template='{rev}:{svnuuid} ', **defaults)
-        self.assertEqual(ui._output,
-                         ('0:df2126f7-00ab-4d49-b42c-7e981dde0bcf '
-                          '1:df2126f7-00ab-4d49-b42c-7e981dde0bcf '
-                          '2: '))
+        commands.log(ui, repo, template=('  rev: {rev} svnrev:{svnrev} '
+                                         'svnpath:{svnpath} svnuuid:{svnuuid}\n'),
+                     **defaults)
+        print ui._output
+        self.assertEqual(ui._output.strip(), '''
+  rev: 2 svnrev: svnpath: svnuuid:
+@
+|
+  rev: 1 svnrev:3 svnpath:/trunk svnuuid:df2126f7-00ab-4d49-b42c-7e981dde0bcf
+o
+|
+  rev: 0 svnrev:2 svnpath:/trunk svnuuid:df2126f7-00ab-4d49-b42c-7e981dde0bcf
+o
+'''.strip())
 
     @test_util.requiresmodule(revset)
     @test_util.requiresmodule(templatekw)