view tests/test-simple-update.out @ 377:e5d769afd3ef

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: f73215065ecbcfd9a0d0964de5ed73a392837a56 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQqNywK+sNU5EO8RAiuOAJ4lL23LcxAkbPHy33snasBgrkhNxQCgkBLO ohB0/EA2dAvQtu5sMSW03D8= =lF8D -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 15 Jun 2005 21:13:49 -0800
parents b4e0e20646bb
children a1ecef497721 688d03d6997a
line wrap: on
line source

+ mkdir test
+ cd test
+ echo foo
+ hg init
+ hg addremove
+ hg commit -t 1
+ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
+ cd ..
+ mkdir branch
+ cd branch
+ hg init ../test
+ hg co
+ echo bar
+ hg commit -t 2
+ cd ../test
+ hg pull ../branch
searching for changes
adding changesets
adding manifests
adding file revisions
modified 1 files, added 1 changesets and 1 new revisions
+ 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