view tests/test-merge8.out @ 7071:643c751e60b2

zeroconf: initial implementation This is a basic, hopefully portable, zeroconf extension. Enabling it will allow hg paths/pull/push/clone/etc. to automatically discover services advertised as "_hg". And naturally, running hg serve will advertise itself as a "_hg" service as well as a "_http" service for use by browsers.
author Matt Mackall <mpm@selenic.com>
date Wed, 08 Oct 2008 19:58:35 -0500
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line source

updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved