Mercurial > hg
changeset 7173:37dd322adc81
Merge with crew
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 19 Oct 2008 19:10:26 +0200 |
parents | fb1d7a42663c (current diff) 834b8d7bd597 (diff) |
children | 14848fc8e26c |
files | mercurial/parsers.c |
diffstat | 4 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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#'
--- 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