mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
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-----
This commit is contained in:
parent
a053dfbfab
commit
9397a75d94
@ -917,6 +917,9 @@ class localrepository:
|
||||
if f in m:
|
||||
raise RepoError("already have changeset " + short(f[:4]))
|
||||
|
||||
if fetch == [nullid]:
|
||||
raise RepoError("unrelated repository")
|
||||
|
||||
self.ui.note("adding new changesets starting at " +
|
||||
" ".join([short(f) for f in fetch]) + "\n")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user