mercurial: Changelog

Sascha Wilde <wilde@sha-bang.de> [Wed, 15 Aug 2007 17:27:51 +0200] rev 5172

Use smerge minor mode in emacs to resolve conflicts. The condition-case is used to suppress errors with emacs versions before 21.

Patrick Mezard <pmezard@gmail.com> [Wed, 15 Aug 2007 16:43:40 +0200] rev 5171

Merge with crew-stable

Thomas Arendsen Hein <thomas@intevation.de> [Tue, 14 Aug 2007 21:36:08 +0200] rev 5170

merge with crew-stable

Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:30:14 +0200] rev 5169

Merge with crew-stable

Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:06:10 +0200] rev 5168

Merge with crew-stable

Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 14 Aug 2007 18:25:27 +0200] rev 5167

fix bundlerepo broken by 4205f626dc05 since we now use struct in case of lazy parser, this have to be an integer instead of None see issue681

Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 16:30:38 +0200] rev 5166

Merge with crew-stable

Brendan Cully <brendan@kublai.com> [Mon, 13 Aug 2007 11:58:47 -0700] rev 5165

imerge: simplify 1d5ebb0d366f

Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5164

imerge: fix status file lookups

Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5163

demandimport: ignore pwd and grp. Both are unavailable under Windows and tarfile detects them via ImportError.

mercurial