Mercurial Mercurial > hg / changelog
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | zip | gz | bz2 | help
(0) -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Thu, 23 Aug 2007 19:52:15 -0700 Merge with crew
changeset
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
changeset
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
changeset
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
changeset
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:53:16 +0200] rev 5237
merge with crew-stable
Fri, 24 Aug 2007 00:39:59 +0200 merge with crew-stable
changeset
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:39:59 +0200] rev 5236
merge with crew-stable
Thu, 23 Aug 2007 13:59:52 -0700 mq: some improvements to header rewriting (closes #690)
changeset
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.
(0) -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip
Mercurial