Maxim Dounin <mdounin@mdounin.ru> [Sat, 27 Oct 2007 16:27:55 +0400] rev 5483
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 26 Oct 2007 16:43:13 -0700] rev 5482
See if execute bit is honoured when we go back in time
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 26 Oct 2007 12:37:59 +0200] rev 5481
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 26 Oct 2007 12:01:14 +0200] rev 5480
patchbomb: fix traceback when diffstat isn't available
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Oct 2007 21:37:20 +0200] rev 5479
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Oct 2007 19:40:56 +0200] rev 5478
Only set mode of new patch if the target file was removed before.
If the file is writable by the user, but owned by a different user, the
chmod will otherwise fail with "Operation not permitted".
Additionally make very sure that the file is only written if either the number
of links is <= 1 or the file was successfully removed.
Maybe this minimal COW code should be replaced by something from util.
Patrick Mezard <pmezard@gmail.com> [Thu, 25 Oct 2007 00:09:13 +0200] rev 5477
Merge with crew-stable
Sebastian Hauer <sebastian.hauer@gmail.com> [Wed, 24 Oct 2007 22:15:45 +0200] rev 5476
httprepo: ignore environment proxies when proxies are disabled
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 20 Oct 2007 03:04:34 +0200] rev 5475
gpg: use the same log message format as hg tag
Matt Mackall <mpm@selenic.com> [Fri, 19 Oct 2007 18:25:28 -0500] rev 5474
Added signature for changeset 23889160905a1b09fffe1c07378e9fc1827606eb
Matt Mackall <mpm@selenic.com> [Fri, 19 Oct 2007 18:25:24 -0500] rev 5473
Added tag 0.9.5 for changeset 23889160905a
Christian Ebert <blacktrash@gmx.net> [Fri, 07 Sep 2007 16:48:42 +0200] rev 5472
Catch smtp exceptions
Jim Hague <jim.hague@acm.org> [Fri, 19 Oct 2007 19:20:33 +0000] rev 5471
tests: make test-mq-guards work with ksh
Matt Mackall <mpm@selenic.com> [Fri, 19 Oct 2007 12:53:43 -0500] rev 5470
tests: tidy up reporting of skipped tests
if not verbose:
- print 's' rather than '.'
- pass skipped test reports back to parent for -j
- report which tests were skipped at the end
- print '.' after test completion
Steve Borho <steve@borho.org> [Tue, 18 Sep 2007 19:53:01 -0500] rev 5469
Allow explicit disabling of extensions
If the first character of an extension path is '!', the extension
is silently skipped.
NIIMI Satoshi <sa2c@sa2c.net> [Thu, 11 Oct 2007 06:13:17 +0900] rev 5468
mq.el: define keymaps as convensions
NIIMI Satoshi <sa2c@sa2c.net> [Thu, 11 Oct 2007 06:10:45 +0900] rev 5467
mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs
NIIMI Satoshi <sa2c@sa2c.net> [Thu, 11 Oct 2007 06:01:30 +0900] rev 5466
mq.el: declare variable mq-top
NIIMI Satoshi <sa2c@sa2c.net> [Thu, 11 Oct 2007 05:58:54 +0900] rev 5465
mercurial.el, mq.el: remove runtime dependencies on CL package
* (require 'cl) at compile-time
* don't use map()
Georg.Koltermann@mscsoftware.com [Thu, 12 Apr 2007 13:11:30 +0200] rev 5464
hgk: colorize commits by authors
Color commits by author. Colors will be assigned to authors by using a configurable list of colors. The line corresponding to current id (the version currently in the working tree) is highlighted in a special font which is also configurable. There is provision to assign fixed colors to authors. See .gitk comment for details.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 15 Oct 2007 12:57:01 -0700] rev 5463
osutil: use fdopendir instead of dirfd
Kirill Smelkov <kirr@landau.phys.spbu.ru> [Sat, 13 Oct 2007 15:25:11 +0400] rev 5462
convert: svn -- fix tags handling
They were simply not detected.
Kirill Smelkov <kirr@landau.phys.spbu.ru> [Sat, 13 Oct 2007 15:22:03 +0400] rev 5461
convert: svn -- fix 'exists'
Previously 'exists' erroneously returned False for empty dirictories. This is
wrong since we want to detect even empty 'branches/' or 'tags/'.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 12 Oct 2007 11:23:03 +0200] rev 5460
merge with goto