Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 511:9f67222186bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disallow merging of unrelated projects -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Disallow merging of unrelated projects manifest hash: 40badbca64e1ccfd83fee8cd7bf5099f57b6f8bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZn6ywK+sNU5EO8RAmdeAJ9TAaGSe0nGMdL+Du3AGwm9x28IUgCgpfGG UunOBkobMVLGdHegnOvQkmQ= =VwVi -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 28 Jun 2005 10:42:02 -0800
parents a350c1cd3fc5
children 874e577e332e
comparison
equal deleted inserted replaced
510:7f3fc8fd427e 511:9f67222186bd
914 p, f = i, f * 2 914 p, f = i, f * 2
915 915
916 for f in fetch: 916 for f in fetch:
917 if f in m: 917 if f in m:
918 raise RepoError("already have changeset " + short(f[:4])) 918 raise RepoError("already have changeset " + short(f[:4]))
919
920 if fetch == [nullid]:
921 raise RepoError("unrelated repository")
919 922
920 self.ui.note("adding new changesets starting at " + 923 self.ui.note("adding new changesets starting at " +
921 " ".join([short(f) for f in fetch]) + "\n") 924 " ".join([short(f) for f in fetch]) + "\n")
922 925
923 self.ui.debug("%d total queries\n" % reqcnt) 926 self.ui.debug("%d total queries\n" % reqcnt)