Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-simple-update.out @ 381:024ee0f8722a
Ancestor algorithm fix
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Ancestor algorithm fix
The ancestor algorithm was a bit too optimistic about node ordering
still. Add revision numbers to the comparison to sort things out.
manifest hash: f4eaf95057b5623e864359706dcaee820b10fd20
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsTrCywK+sNU5EO8RAtqMAJ9fEJEesPn+0SMg/i/g5vZYmX/pBgCfVnhl
+s88q/Wilw27MVWP6J6oqX8=
=k9AU
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Thu, 16 Jun 2005 00:39:30 -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