Mercurial > hg > pyhgsh

view tests/test-merge6.out @ 2081:416d8b2a75b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Speedup revlog.ancestors for the linear case revlog.ancestors can be expensive on big repos. This cuts down the overall time for hg update by ~19% by short cutting revlog.ancestors when one of the revisions is reachable from another.
author Chris Mason <mason@suse.com>
date Thu, 06 Apr 2006 20:13:09 -0400
parents ced2d3620f95
children b2ae81a7df29
line wrap: on
line source

pulling from ../B1
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
pulling from ../A2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo