Wed, 07 Dec 2011 16:19:39 -0600 bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
Matt Mackall <mpm@selenic.com> [Wed, 07 Dec 2011 16:19:39 -0600] rev 15614
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
Tue, 06 Dec 2011 14:17:33 -0600 bookmarks: shadow divergent bookmarks of foo with foo@n
Matt Mackall <mpm@selenic.com> [Tue, 06 Dec 2011 14:17:33 -0600] rev 15613
bookmarks: shadow divergent bookmarks of foo with foo@n
Tue, 06 Dec 2011 13:21:45 +0100 help: properly underline annotate config heading
Christian Ebert <blacktrash@gmx.net> [Tue, 06 Dec 2011 13:21:45 +0100] rev 15612
help: properly underline annotate config heading
Mon, 05 Dec 2011 17:48:40 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 05 Dec 2011 17:48:40 -0600] rev 15611
merge with stable
Mon, 05 Dec 2011 17:09:11 -0600 branch: move note about permanence to the top, add 'global' stable
Matt Mackall <mpm@selenic.com> [Mon, 05 Dec 2011 17:09:11 -0600] rev 15610
branch: move note about permanence to the top, add 'global'
Sun, 04 Dec 2011 18:22:25 +0100 util: fix url.__str__() for windows file URLs stable
Patrick Mezard <pmezard@gmail.com> [Sun, 04 Dec 2011 18:22:25 +0100] rev 15609
util: fix url.__str__() for windows file URLs Before: >>> str(url('file:///c:/tmp/foo/bar')) 'file:c%3C/tmp/foo/bar' After: >>> str(url('file:///c:/tmp/foo/bar')) 'file:///c%3C/tmp/foo/bar' The previous behaviour had no effect on mercurial itself (clone command for instance) because we fortunately called .localpath() on the parsed URL. hgsubversion was not so lucky and cloning a local subversion repository on Windows no longer worked on the default branch (it works on stable because de7e2fba4326 defeats the hasdriveletter() test in url class). I do not know if the %3C is correct or not but svn accepts file:// URLs containing it. Mads fixed it in de7e2fba4326, so we can always backport should the need arise.
Fri, 02 Dec 2011 21:38:57 -0200 convert: tolerate trailing spaces on map files stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 02 Dec 2011 21:38:57 -0200] rev 15608
convert: tolerate trailing spaces on map files A convert run with a branchmap made with echo default namedbranch > branchmap on Windows fails silently and surprisingly; it actually adds a space after 'namedbranch', so it ends up mapping "default namedbranch" to "". This also affects splicemaps, since the same parser is used for both.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip