Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 16:31:37 +0200] rev 5244
cgi: sys.path.insert should be before importing mercurial
thanks to R. Burke
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 11:30:59 +0200] rev 5243
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 11:30:11 +0200] rev 5242
improve error message for 'hg merge' when repo already at branchtip
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 22:45:41 -0700] rev 5241
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 19:52:15 -0700] rev 5240
Merge with crew
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 19:51:59 -0700] rev 5239
imerge: fix ancestor calculation
If wctx already has two parents, ancestor calculation is wrong.
Normally merge is called before wctx gets the second parent, so
we simulate this in imerge by temporarily popping the second parent
before calling filemerge. Highly dirty.
This patch also handles the ParseError move from cmdutil to dispatch.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:56:56 +0200] rev 5238
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:53:16 +0200] rev 5237
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:39:59 +0200] rev 5236
merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 13:59:52 -0700] rev 5235
mq: some improvements to header rewriting (closes #690)
Tested with qrefresh -m against the mm series.