Mercurial > hg

changeset 9921:b22ff29a3fbb stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Tue, 24 Nov 2009 10:23:53 -0600
parents f5fa1b5863de (current diff) e3237af51def (diff)
children e84066a49e3a 251812d34c08
files
diffstat 4 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/win32/mercurial.iss	Mon Nov 23 15:15:01 2009 -0200
+++ b/contrib/win32/mercurial.iss	Tue Nov 24 10:23:53 2009 -0600
@@ -62,6 +62,7 @@
 Source: dist\add_path.exe; DestDir: {app}
 Source: doc\*.html; DestDir: {app}\Docs
 Source: doc\style.css; DestDir: {app}\Docs
+Source: help\*.txt; DestDir: {app}\help
 Source: locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs
 Source: templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs
 Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
--- a/tests/run-tests.py	Mon Nov 23 15:15:01 2009 -0200
+++ b/tests/run-tests.py	Tue Nov 24 10:23:53 2009 -0600
@@ -785,6 +785,7 @@
     os.environ['TZ'] = 'GMT'
     os.environ["EMAIL"] = "Foo Bar <foo.bar@example.com>"
     os.environ['CDPATH'] = ''
+    os.environ['COLUMNS'] = '80'
 
     global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
     TESTDIR = os.environ["TESTDIR"] = os.getcwd()
--- a/tests/test-churn	Mon Nov 23 15:15:01 2009 -0200
+++ b/tests/test-churn	Tue Nov 24 10:23:53 2009 -0600
@@ -3,8 +3,6 @@
 echo "[extensions]" >> $HGRCPATH
 echo "churn=" >> $HGRCPATH
 
-COLUMNS=80; export COLUMNS
-
 echo % create test repository
 hg init repo
 cd repo
--- a/tests/test-patchbomb	Mon Nov 23 15:15:01 2009 -0200
+++ b/tests/test-patchbomb	Tue Nov 24 10:23:53 2009 -0600
@@ -12,8 +12,6 @@
 echo "[extensions]" >> $HGRCPATH
 echo "patchbomb=" >> $HGRCPATH
 
-COLUMNS=80; export COLUMNS
-
 hg init t
 cd t
 echo a > a