Mercurial > hg

view tests/test-commit-copy.out @ 5239:8860f29447c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Brendan Cully <brendan@kublai.com>
date Thu, 23 Aug 2007 19:51:59 -0700
parents 6990e499d71a
children
line wrap: on
line source

foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       6      0       0 26d3ca0dfd18 000000000000 000000000000
     1         6       7      1       1 d267bddd54f7 26d3ca0dfd18 000000000000