Stuart W Marks <smarks@smarks.org> [Thu, 17 Sep 2009 22:39:38 -0700] rev 649
hg: say 'hg update' instead of 'hg up' in merge status message
Includes the change to the message itself, along with several test
output files that also had to change.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:06:50 +0200] rev 648
(0.9.2compat) do not mark debug message for translation
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:04:38 +0200] rev 647
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 19 Sep 2009 01:15:38 +0200] rev 646
do not attempt to translate ui.debug output
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:41 +0200] rev 645
(stable) merge with default
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:02 +0200] rev 644
(0.9.2compat): run kwdemo before setting up [keyword] files
Ensures that kwdemo runs correctly without further configuration.
Also no need to specify --default option.
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Sep 2009 23:15:37 +0200] rev 643
test: run kwdemo before setting up [keyword] files
kwdemo would pass the test without uisetup otherwise.
Also no need to specify --default option.
Christian Ebert <blacktrash@gmx.net> [Fri, 28 Aug 2009 16:18:28 +0100] rev 642
Merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 27 Aug 2009 00:00:15 +0200] rev 641
test-keyword: update output to match 5d49fdef6fd0
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:25:33 +0200] rev 640
(0.9.2compat) update and rewrap documentation
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:18:32 +0200] rev 639
(0.9.2compat) prefer util.datestr over time module import
We keep the function in this branch to catch the TypeError.
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:01:55 +0200] rev 638
(0.9.2compat) remove "help keyword" from test
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:57:21 +0200] rev 637
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:49 +0200] rev 636
Use util.datestr for utcdate filter, make it accessable in variable
lambda syntax mimicking templatefilters.py
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:44 +0200] rev 635
Reference templating help, add utcdate filter example