# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1224436226 -7200
# Node ID 37dd322adc81c2f02b0f301df67077a5d571dc21
# Parent  fb1d7a42663c194a618910b2dd78ed8c2c456207# Parent  834b8d7bd5978a85c22b880d0c24241416d24672
Merge with crew

diff -r fb1d7a42663c -r 37dd322adc81 mercurial/parsers.c
--- a/mercurial/parsers.c	Sun Oct 19 19:03:23 2008 +0200
+++ b/mercurial/parsers.c	Sun Oct 19 19:10:26 2008 +0200
@@ -408,7 +408,6 @@
 	Py_XDECREF(nodemap);
 	Py_XDECREF(cache);
 	Py_XDECREF(rval);
-	Py_XDECREF(data_obj);
 	return NULL;
 }
 
diff -r fb1d7a42663c -r 37dd322adc81 templates/raw/map
--- a/templates/raw/map	Sun Oct 19 19:03:23 2008 +0200
+++ b/templates/raw/map	Sun Oct 19 19:10:26 2008 +0200
@@ -6,8 +6,8 @@
 difflineminus = '#line#'
 difflineat = '#line#'
 diffline = '#line#'
-changesetparent = '# Parent #node#'
-changesetchild = '# Child #node#'
+changesetparent = '# Parent  #node#'
+changesetchild = '# Child   #node#'
 filenodelink = ''
 fileline = '#line#'
 diffblock = '#lines#'
diff -r fb1d7a42663c -r 37dd322adc81 tests/test-hgweb-commands.out
Binary file tests/test-hgweb-commands.out has changed
diff -r fb1d7a42663c -r 37dd322adc81 tests/test-keyword.out
--- a/tests/test-keyword.out	Sun Oct 19 19:03:23 2008 +0200
+++ b/tests/test-keyword.out	Sun Oct 19 19:10:26 2008 +0200
@@ -416,7 +416,7 @@
 # User User Name <user@example.com>
 # Date 3 0
 # Node ID cfa68229c1167443337266ebac453c73b1d5d16e
-# Parent bb948857c743469b22bbf51f7ec8112279ca5d83
+# Parent  bb948857c743469b22bbf51f7ec8112279ca5d83
 xa
 
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000