Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
authorThomas Arendsen Hein <thomas@intevation.de>
Sun, 19 Oct 2008 19:10:26 +0200
changeset 7173 37dd322adc81
parent 7172 fb1d7a42663c (current diff)
parent 7168 834b8d7bd597 (diff)
child 7176 14848fc8e26c
Merge with crew
mercurial/parsers.c file | annotate | diff | comparison | revisions 
--- 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;
 }
 
--- 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#'
Binary file tests/test-hgweb-commands.out has changed
--- 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
mercurial