view tests/test-simple-update.out @ 768:20e95c245bc3

Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH
author mpm@selenic.com
date Sat, 23 Jul 2005 10:00:56 -0500
parents 61ed30e82b27
children 122449dd89db 445970ccf57a
line wrap: on
line source

+ mkdir test
+ cd test
+ echo foo
+ hg init
+ hg addremove
adding foo
+ hg commit -m 1
+ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
+ hg clone . ../branch
+ cd ../branch
+ hg co
+ echo bar
+ hg commit -m 2
+ cd ../test
+ hg pull ../branch
pulling from ../branch
searching for changes
adding changesets
adding manifests
adding file revisions
modified 1 files, added 1 changesets and 1 new revisions
(run 'hg update' to get a working copy)
+ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
+ hg co
+ cat foo
foo
bar
+ hg manifest
6f4310b00b9a147241b071a60c28a650827fb03d 644 foo