Mercurial > hg-stable
changeset 2551:764a54eb8c5a
merge with crew.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Mon, 03 Jul 2006 10:19:09 -0700 |
| parents | 45235e492cc6 (current diff) 0229ff95faec (diff) |
| children | bb403d427974 |
| files | mercurial/localrepo.py |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Mon Jul 03 10:18:46 2006 -0700 +++ b/mercurial/localrepo.py Mon Jul 03 10:19:09 2006 -0700 @@ -1645,8 +1645,8 @@ linear_path = (pa == p1 or pa == p2) if allow and linear_path: - raise util.Abort(_("there is nothing to merge, " - "just use 'hg update'")) + raise util.Abort(_("there is nothing to merge, just use " + "'hg update' or look at 'hg heads'")) if allow and not forcemerge: if modified or added or removed: raise util.Abort(_("outstanding uncommitted changes"))
--- a/tests/test-webraw Mon Jul 03 10:18:46 2006 -0700 +++ b/tests/test-webraw Mon Jul 03 10:19:09 2006 -0700 @@ -17,4 +17,5 @@ kill `cat hg.pid` sleep 1 # wait for server to scream and die cat getoutput.txt -cat access.log error.log | sed 's/^\([^[]*\[\)[^]]*\(\].*\)$/\1date\2/g' +cat access.log error.log | \ + sed 's/^[^ ]*\( [^[]*\[\)[^]]*\(\].*\)$/host\1date\2/'
--- a/tests/test-webraw.out Mon Jul 03 10:18:46 2006 -0700 +++ b/tests/test-webraw.out Mon Jul 03 10:19:09 2006 -0700 @@ -7,4 +7,4 @@ that will go inside the file and take a few lines. It is very boring to read, but computers don't care about things like that. -localhost - - [date] "GET /?f=f165dc289438;file=sometext.txt;style=raw HTTP/1.1" 200 - +host - - [date] "GET /?f=f165dc289438;file=sometext.txt;style=raw HTTP/1.1" 200 -