# HG changeset patch # User mpm@selenic.com # Date 1119985585 28800 # Node ID 874e577e332e6f516403f4bfe85f8f21cbc85719 # Parent 2ab152e45de44699de76801dabad25c0df01d4e4 change unrelated repository error to a warning -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 change unrelated repository error to a warning manifest hash: 7c1481639c7e7ba91fd391a9fa6eb17e838f894e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZ+xywK+sNU5EO8RAnnjAJ494NZfAdMVP48VegHQ+WeZ05DPogCbBEWC d3N47FYG87x1CJOh9VzwVCQ= =lrGp -----END PGP SIGNATURE----- diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -918,7 +918,7 @@ class localrepository: raise RepoError("already have changeset " + short(f[:4])) if fetch == [nullid]: - raise RepoError("unrelated repository") + self.ui.warn("warning: pulling from an unrelated repository!\n") self.ui.note("adding new changesets starting at " + " ".join([short(f) for f in fetch]) + "\n")