change unrelated repository error to a warning
authormpm@selenic.com
Tue, 28 Jun 2005 11:06:25 -0800
changeset 514 874e577e332e
parent 513 2ab152e45de4
child 515 03f27b1381f9
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-----
mercurial/hg.py
--- a/mercurial/hg.py	Tue Jun 28 10:50:13 2005 -0800
+++ b/mercurial/hg.py	Tue Jun 28 11:06:25 2005 -0800
@@ -918,7 +918,7 @@
                 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")