Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 18 Mar 2009 17:49:48 +0100] rev 7858
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 18 Mar 2009 17:49:11 +0100] rev 7857
convert: honor 2.3 compatibility (rsplit)
Matt Mackall <mpm@selenic.com> [Tue, 17 Mar 2009 13:46:53 -0500] rev 7856
Merge with stable
Benjamin Pollack <benjamin@bitquabit.com> [Tue, 17 Mar 2009 11:34:40 -0400] rev 7855
regression test for issue1552
Ensures that fetch correctly infers what to merge when pulling a
repository with inactive branches.
Benjamin Pollack <benjamin@bitquabit.com> [Tue, 17 Mar 2009 11:47:40 -0400] rev 7854
fetch: do not count inactive branches when inferring a merge
The fetch extension would erroneously consider inactive branches when
inferring which branches to merge. It now considers only active
branches.
Matt Mackall <mpm@selenic.com> [Tue, 17 Mar 2009 13:43:11 -0500] rev 7853
bundlerepo: reintroduce dirstate
Michael Springmann <michael.springmann@unibas.ch> [Fri, 13 Mar 2009 21:14:57 +0100] rev 7852
exporting patch:
Fixed behavior of revsplit for branch names including the @-symbol.
Matt Mackall <mpm@selenic.com> [Mon, 16 Mar 2009 17:21:10 -0500] rev 7851
imported patch issue1546-hg-bisect-command-doesn-t-work-with-shell-scripts.patch
Augie Fackler <durin42@gmail.com> [Mon, 09 Mar 2009 17:13:12 -0500] rev 7850
bisect: fix --command for me.
Matt Mackall <mpm@selenic.com> [Mon, 16 Mar 2009 17:21:06 -0500] rev 7849
atom: fix URLs used in entry GUIDs
Matt Mackall <mpm@selenic.com> [Mon, 16 Mar 2009 16:58:41 -0500] rev 7848
resolve: move reset to localrepo.commit
This way rebase doesn't leave a stale resolve state
Matt Mackall <mpm@selenic.com> [Mon, 16 Mar 2009 16:58:41 -0500] rev 7847
resolve: keep .orig files
Mads Kiilerich <mads@kiilerich.com> [Mon, 09 Mar 2009 18:44:44 +0100] rev 7846
test-merge-tools: test ui.merge functionality and selection of internal tools
Alexander Solovyov <piranha@piranha.org.ua> [Thu, 05 Mar 2009 12:58:13 +0200] rev 7845
zeroconf: advertise repositories with hostname
Matt Mackall <mpm@selenic.com> [Mon, 16 Mar 2009 17:56:50 -0500] rev 7844
Merge with crew
Martin Geisler <mg@daimi.au.dk> [Tue, 10 Mar 2009 23:41:37 +0100] rev 7843
i18n: better Danish word for "working directory"
Martin Geisler <mg@daimi.au.dk> [Tue, 10 Mar 2009 23:32:40 +0100] rev 7842
i18n: add Danish translation for "commit"
Martin Geisler <mg@daimi.au.dk> [Tue, 10 Mar 2009 23:32:13 +0100] rev 7841
i18n: translated help for all basic commands into Danish
Martin Geisler <mg@daimi.au.dk> [Tue, 10 Mar 2009 23:31:18 +0100] rev 7840
i18n: updated fuzzy Danish translations
Martin Geisler <mg@daimi.au.dk> [Tue, 10 Mar 2009 23:30:51 +0100] rev 7839
i18n: merged new strings into Danish translation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 07 Mar 2009 23:36:22 +0900] rev 7838
i18n: update Japanese translation to follow bd8f44638847
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 07 Mar 2009 20:30:20 +0100] rev 7837
merge with -stable
Brendan Cully <brendan@kublai.com> [Fri, 06 Mar 2009 12:35:48 -0800] rev 7836
Merge with main
Mads Kiilerich <mads@kiilerich.com> [Wed, 04 Mar 2009 23:23:59 +0100] rev 7835
Optimization of pure.base85.b85encode
This makes pure python base85 encoding 3x faster than before. Now it is only
40x slower than the C version.