Bryan O'Sullivan <bos@serpentine.com> [Sat, 04 Aug 2007 12:38:30 -0700] rev 5066
convert: drop duplicated assignments.
Brendan Cully <brendan@kublai.com> [Sat, 04 Aug 2007 12:26:48 -0700] rev 5065
imerge: gussy up dispatcher to support subcommand opts.
Add -n, --resolved, --unresolved to status.
Brendan Cully <brendan@kublai.com> [Sat, 04 Aug 2007 09:33:10 -0700] rev 5064
Merge with crew
Brendan Cully <brendan@kublai.com> [Fri, 03 Aug 2007 18:05:20 -0700] rev 5063
imerge: handle renames
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 04 Aug 2007 09:48:21 +0200] rev 5062
merge with crew-stable
Brendan Cully <brendan@kublai.com> [Tue, 10 Jul 2007 10:06:24 -0700] rev 5061
archive: abort on empty repository. Fixes #624.
Matt Mackall <mpm@selenic.com> [Thu, 02 Aug 2007 13:23:53 -0500] rev 5060
Merge with -stable
Matt Mackall <mpm@selenic.com> [Thu, 02 Aug 2007 12:29:10 -0500] rev 5059
merge: avoid double deletion mentioned in issue636
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Aug 2007 13:03:25 +0200] rev 5058
merge with hg-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Aug 2007 14:51:49 +0200] rev 5057
The >| redirection does not exist in plain sh.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Aug 2007 14:04:51 +0200] rev 5056
imerge: sorted() is only available in python2.4 and above
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 02 Aug 2007 14:04:00 +0200] rev 5055
imerge: tarfile.extractall is only available in python2.5
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 23:59:19 -0700] rev 5054
Update imerge for new filemerge interface
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 02 Aug 2007 01:56:08 -0300] rev 5053
del transaction before lock before wlock
This way rollbacks happen while the repo is still locked.
Deleting lock before wlock is not strictly necessary, but is
more consistent with the locking order.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 02 Aug 2007 01:56:08 -0300] rev 5052
convert: fix locking order