Mercurial: Changelog

Mercurial Mercurial > hg / changelog

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | zip | gz | bz2 | help
(0) -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip

Sat, 25 Aug 2007 11:30:59 +0200 merge with crew

Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 11:30:59 +0200] rev 5243

merge with crew

Sat, 25 Aug 2007 11:30:11 +0200 improve error message for 'hg merge' when repo already at branchtip

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

Thu, 23 Aug 2007 22:45:41 -0700 imerge: add automerge flag to attempt to batch merge all conflicts

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

Thu, 23 Aug 2007 19:52:15 -0700 Merge with crew

Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 19:52:15 -0700] rev 5240

Merge with crew

Thu, 23 Aug 2007 19:51:59 -0700 imerge: fix ancestor calculation

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.

Fri, 24 Aug 2007 00:56:56 +0200 merge with crew-stable

Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:56:56 +0200] rev 5238

merge with crew-stable

Fri, 24 Aug 2007 00:53:16 +0200 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

(0) -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip

Mercurial