view tests/test-simple-update.out @ 8257:e745063b94dd

Fix missing import from e68e149f4d44 merge
author Patrick Mezard <pmezard@gmail.com>
date Thu, 30 Apr 2009 08:38:20 +0200
parents 0750f11152fe
children a3d73b3e1f8a
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
updating working directory
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