Mon, 16 May 2011 21:41:46 +0200 run-tests: ignore timeout when Popen.terminate is unavailable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:41:46 +0200] rev 14337
run-tests: ignore timeout when Popen.terminate is unavailable Popen.terminate was introduced in python 2.6
Mon, 16 May 2011 21:26:50 +0200 run-tests: fix hg.bat python reference
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:26:50 +0200] rev 14336
run-tests: fix hg.bat python reference hg.bat expects to live in pythonxx/scripts and the python interpreter to be in pythonxx. run-tests.py file layout is a little different and python location must be fixed.
Mon, 16 May 2011 21:24:14 +0200 run-tests: fix python executable detection and copy on Windows
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:24:14 +0200] rev 14335
run-tests: fix python executable detection and copy on Windows
Mon, 16 May 2011 13:06:48 +0200 changelog: don't use generaldelta
Sune Foldager <cryo@cyanite.org> [Mon, 16 May 2011 13:06:48 +0200] rev 14334
changelog: don't use generaldelta
Mon, 16 May 2011 12:44:34 +0200 revlog: get rid of defversion
Sune Foldager <cryo@cyanite.org> [Mon, 16 May 2011 12:44:34 +0200] rev 14333
revlog: get rid of defversion defversion was a property (later option) on the store opener, used to propagate the changelog revlog format to the other revlogs, so they would be created with the same format. This required that the changelog instance was created before any other revlog; an invariant that wasn't directly enforced (or documented) anywhere. We now use the revlogv1 requirement instead, which is transfered to the store opener options. If this option is missing, v0 revlogs are created.
Mon, 16 May 2011 11:52:28 +0200 bash_completion: Use "hg paths -q" instead of piping through sed
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 16 May 2011 11:52:28 +0200] rev 14332
bash_completion: Use "hg paths -q" instead of piping through sed
Mon, 16 May 2011 11:41:48 +0200 paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 16 May 2011 11:41:48 +0200] rev 14331
paths: Add support for -q/--quiet Suppresses output (resolved paths or "not found!") when searching a path, similar to "grep -q". Sample usage: hg paths -q foo || echo "there is no foo" Just prints path names (instead of "name = result") when listing all path definitions, like "hg bookmarks -q". Sample usage: hg paths -q | while read i; do hg incoming "$i"; done
Mon, 16 May 2011 11:14:06 +0200 fix test broken in merge from stable
Sune Foldager <cryo@cyanite.org> [Mon, 16 May 2011 11:14:06 +0200] rev 14330
fix test broken in merge from stable
Sun, 15 May 2011 13:15:41 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 15 May 2011 13:15:41 -0500] rev 14329
merge with stable
Fri, 13 May 2011 19:46:36 -0500 simplemerge: do not allow binary files to abort an entire merge stable
Steve Borho <steve@borho.org> [Fri, 13 May 2011 19:46:36 -0500] rev 14328
simplemerge: do not allow binary files to abort an entire merge When used as the default merge tool, or used as a --tool override, the simplemerge script should not be allowed to raise a util.Abort just because one of the files being merged is binary. Instead, return 1 and mark the file unresolved.
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip