Mercurial > hg

view tests/test-simple-update.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 9d1c3529ebbc
children 8feb33c2d153
line wrap: on
line source

adding foo
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../branch
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
foo
bar
6f4310b00b9a147241b071a60c28a650827fb03d 644 foo