Martin Geisler <mg@daimi.au.dk> [Sat, 09 Aug 2008 02:10:22 +0200] rev 6871
mdiff: compare content of binary files directly
A plain Python string comparison stops when the first mismatch is
found, whereas the call to md5 would need to compute the hash over the
entire string and only then do the comparison.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 08 Aug 2008 18:49:55 +0200] rev 6870
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 08 Aug 2008 18:48:26 +0200] rev 6869
Make test-hardlinks-safety repeatable and executable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 08 Aug 2008 18:37:50 +0200] rev 6868
convert: Fix debugging output when running multiple commands with xargs.
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Aug 2008 09:53:57 +0200] rev 6867
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Add test as well.
Thanks to Guy Brand for spotting this.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 07 Aug 2008 09:53:27 +0200] rev 6866
merge with crew-stable
Doug Philips <dgou@mac.com> [Thu, 07 Aug 2008 09:31:42 +0200] rev 6865
Let the notify extension use [diff] options too.
rubik <ribik@sina.com> [Wed, 06 Aug 2008 17:19:14 -0500] rev 6864
coal/paper: fixed box via an expression for IE < 7
Brendan Cully <brendan@kublai.com> [Wed, 06 Aug 2008 15:08:18 -0700] rev 6863
Fix intermittent broken pipe in test-highlight
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 06 Aug 2008 15:10:05 +0200] rev 6862
ui: add an option to prompt for the username when it isn't provided
When ui.askusername is set and not username are specified on the command line,
in hgrc or in the variables $HGUSER or $EMAIL, then hg will prompt for the
username.
Feature requested, and documentation provided by Mark Edgington.
Patrick Mezard <pmezard@gmail.com> [Sat, 02 Aug 2008 23:45:10 +0200] rev 6861
Merge with crew-stable
Bernhard Leiner <bleiner@gmail.com> [Sat, 02 Aug 2008 22:10:54 +0200] rev 6860
add additional bisect tests
Bernhard Leiner <bleiner@gmail.com> [Sat, 02 Aug 2008 22:11:22 +0200] rev 6859
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com> [Sat, 02 Aug 2008 22:10:10 +0200] rev 6858
Add support for multiple possible bisect results (issue1228, issue1182)
The real reason for both issue is that bisect can not handle cases where there
are multiple possibilities for the result.
Example (from issue1228):
rev 0 -> good
rev 1 -> skipped
rev 2 -> skipped
rev 3 -> skipped
rev 4 -> bad
Note that this patch does not only fix the reported Assertion Error but also
the problem of a non converging bisect:
hg init
for i in `seq 3`; do echo $i > $i; hg add $i; hg ci -m$i; done
hg bisect -b 2
hg bisect -g 0
hg bisect -s
From this state on, you can:
a) mark as bad forever (non converging!)
b) mark as good to get an inconsistent state
c) skip for the Assertion Error
Minor description and code edits by pmezard.
Patrick Mezard <pmezard@gmail.com> [Sat, 02 Aug 2008 14:08:21 +0200] rev 6857
Merge with crew-stable
Kevin Christen <kevin.christen@gmail.com> [Tue, 15 Jul 2008 18:10:37 -0500] rev 6856
Add a reset before and after colorized output
This is how GNU's ls --color works, and it clears up problems in xterm and
Windows command prompt windows.
Kevin Christen <kevin.christen@gmail.com> [Wed, 23 Jul 2008 20:33:23 -0500] rev 6855
Apply color to output of qseries --verbose
Fixes issue 1173.
Patrick Mezard <pmezard@gmail.com> [Sat, 02 Aug 2008 13:49:13 +0200] rev 6854
color: improve mq extension detection
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 01 Aug 2008 12:33:10 +0200] rev 6853
hgweb: do not use unassigned variables in exception handling
Patrick Mezard <pmezard@gmail.com> [Wed, 30 Jul 2008 22:33:40 +0200] rev 6852
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 30 Jul 2008 22:26:41 +0200] rev 6851
Fix subversion tests with svn 1.5
Patrick Mezard <pmezard@gmail.com> [Sun, 27 Jul 2008 17:09:33 +0200] rev 6850
convert: normalize paths sent to svn get_log (issue 1219)
Patrick Mezard <pmezard@gmail.com> [Fri, 25 Jul 2008 20:47:04 +0200] rev 6849
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 25 Jul 2008 20:43:41 +0200] rev 6848
convert: remove leading slash from ra.check_path inputs (issue 1236)
Patrick Mezard <pmezard@gmail.com> [Fri, 25 Jul 2008 20:37:41 +0200] rev 6847
convert: restore previous svn transport parent correctly
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 21 Jul 2008 13:26:42 +0200] rev 6846
context: get rid of unused changectx.filectxs() method
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 21 Jul 2008 13:22:11 +0200] rev 6845
context: fix workingctx's __contains__ method
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 21 Jul 2008 13:17:51 +0200] rev 6844
merge: use correct branch name for counting heads
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 25 Jul 2008 13:27:06 +0200] rev 6843
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 25 Jul 2008 13:26:16 +0200] rev 6842
add note about updating one file to update help