Thu, 05 Nov 2009 10:53:59 +0100 update: allow branch crossing without -c or -C, with no uncommitted changes
Stuart W Marks <smarks@smarks.org> [Thu, 05 Nov 2009 10:53:59 +0100] rev 9717
update: allow branch crossing without -c or -C, with no uncommitted changes Update will now allow crossing branches within the same named branch, when given a specific revision, if the working dir is clean, without requiring the -c or -C option. Abort if no revision is given and this would cross branches. Minor change to abort message if uncommitted changes are found. Modify test-update-branches and output to reflect the altered case. Modify test-merge5.out to reflect the altered case. Modify test-up-local-change.out with new message.
Thu, 05 Nov 2009 10:53:36 +0100 update: add comments and test cases for updating across branches
Stuart W Marks <smarks@smarks.org> [Thu, 05 Nov 2009 10:53:36 +0100] rev 9716
update: add comments and test cases for updating across branches Add comment to merge.py:update() showing various cases of 'hg update': to a descendant, crossing named branches, and crossing branches within a named branch; with no option, -c or -C; with or without uncommitted changes; and with or without a specific revision. Add tests for all of these cases.
Thu, 05 Nov 2009 10:49:28 +0100 patchbomb: fix handling of email addresses with Unicode domains (IDNA)
Marti Raudsepp <marti@juffo.org> [Thu, 05 Nov 2009 10:49:28 +0100] rev 9715
patchbomb: fix handling of email addresses with Unicode domains (IDNA) dom.encode('idna') requires dom to be a Unicode string.
Thu, 05 Nov 2009 11:05:13 +0100 clone: add option -u/--updaterev
Adrian Buehlmann <adrian@cadifra.com> [Thu, 05 Nov 2009 11:05:13 +0100] rev 9714
clone: add option -u/--updaterev
Thu, 05 Nov 2009 11:07:01 +0100 hgweb/sshserver: extract capabilities for easier modification
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 11:07:01 +0100] rev 9713
hgweb/sshserver: extract capabilities for easier modification
Thu, 05 Nov 2009 10:44:36 +0100 kill trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 10:44:36 +0100] rev 9712
kill trailing whitespace
Thu, 05 Nov 2009 01:11:28 +0100 color: wrap qrecord
Martin Geisler <mg@lazybytes.net> [Thu, 05 Nov 2009 01:11:28 +0100] rev 9711
color: wrap qrecord The qrecord command is registered in uisetup phase, so we do our wrapping in extsetup phase.
Thu, 05 Nov 2009 01:10:43 +0100 record: use uisetup instead of extsetup to register qrecord
Martin Geisler <mg@lazybytes.net> [Thu, 05 Nov 2009 01:10:43 +0100] rev 9710
record: use uisetup instead of extsetup to register qrecord New commands should be registered in uisetup so that other extensions have a change of wrapping them in extsetup.
Wed, 04 Nov 2009 15:18:19 +0100 merge: supply base node to merge tools in the environment
Sune Foldager <cryo@cyanite.org> [Wed, 04 Nov 2009 15:18:19 +0100] rev 9709
merge: supply base node to merge tools in the environment Merge tools will be able to exploit this to correctly merge backouts. This won't work fully, though, until issue 1327 is solved, since the node information is not necessarily correct.
Wed, 04 Nov 2009 09:34:04 +0100 test-bisect: normalize shell error message
Martin Geisler <mg@lazybytes.net> [Wed, 04 Nov 2009 09:34:04 +0100] rev 9708
test-bisect: normalize shell error message Different shells on vary in their error messages. Here we're satisfied if the shell mentions './foobar' at all.
(0) -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip