Mercurial > hg
diff tests/test-unrelated-pull.out @ 579:ffeb2c3a1966
Actually warn on pulling from an unrelated repository
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Actually warn on pulling from an unrelated repository
add some comments to findincoming
track the base nodes of the fetch set
report if the base set only contains nullid
add a test case
manifest hash: 3fc038a6041b0967a20503f5ec8876efc038841a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx0yLywK+sNU5EO8RAlK6AJ9J/GKPpYSMzTqmguXPWOISJ+zY5gCghd+j
ClLpn0dKZnB46dh0F8zhuuk=
=emNb
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sat, 02 Jul 2005 18:25:15 -0800 |
parents | |
children | 122449dd89db 445970ccf57a |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-unrelated-pull.out Sat Jul 02 18:25:15 2005 -0800 @@ -0,0 +1,19 @@ +pulling from ../a +searching for changes +warning: pulling from an unrelated repository! +adding changesets +adding manifests +adding file revisions +modified 1 files, added 1 changesets and 1 new revisions +(run 'hg update' to get a working copy) +changeset: 1:9a79c33a9db37480e40fbd2a65d62ebd2a3c441c +tag: tip +user: a +date: Thu Jan 1 00:00:00 1970 +summary: a + +changeset: 0:01f8062b2de51c0fa6428c5db1d1b3ea780189df +user: b +date: Thu Jan 1 00:00:00 1970 +summary: b +